Those headers remained unused outside the internal framework. So it is better to remove them from the public API. Issue #1832
The test did not fail actually. It just behaved strangely and got stuck in the good case, which is fixed now. Fixes #1121.
This patch changes the top-level directory layout as a preparatory step for improving the tools for managing 3rd-party source codes. The rationale is described in the issue referenced below. Issue #1082