Squashed 'shared/c-rbtree/' changes from bf627e0c32..b46392d25d

b46392d25d build: use c-stdaux
61f21750be build: pull in c-stdaux
31fcf75afe build: sync with c-util
fec7b8f2da ci: add run with -DNDEBUG

git-subtree-dir: shared/c-rbtree
git-subtree-split: b46392d25de7a7bab67d48ef18bf8350b429cff5

20 files changed, 251 insertions, 939 deletions

diff --git a/.cherryci/matrix b/.cherryci/matrix
new file mode 100755
index 0000000000..6cb6f71ebb
--- /dev/null
+++ b/.cherryci/matrix
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -e
+
+_CHERRY_LIB_M_GCC_NDEBUG=("CC=gcc" "CFLAGS='${CHERRY_LIB_CFLAGS[*]} ${CHERRY_LIB_CFLAGS_GCC[*]} -O2 -DNDEBUG'")
+CHERRY_MATRIX+=("export ${_CHERRY_LIB_M_GCC_NDEBUG[*]}")
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000000..a86b29fd1c
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "subprojects/c-stdaux"]
+	path = subprojects/c-stdaux
+	url = https://github.com/c-util/c-stdaux.git
diff --git a/AUTHORS b/AUTHORS
index 980d602337..b59660c5ee 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -30,8 +30,8 @@ AUTHORS-LGPL:
         along with this program; If not, see <http://www.gnu.org/licenses/>.
 
 COPYRIGHT: (ordered alphabetically)
-        Copyright (C) 2015-2018 Red Hat, Inc.
+        Copyright (C) 2015-2019 Red Hat, Inc.
 
 AUTHORS: (ordered alphabetically)
-        David Herrmann <dh.herrmann@gmail.com>
+        David Rheinsberg <david.rheinsberg@gmail.com>
         Tom Gundersen <teg@jklm.no>
diff --git a/AUTHORS-ASL b/AUTHORS-ASL
deleted file mode 100644
index 5d501a7284..0000000000
--- a/AUTHORS-ASL
+++ /dev/null
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "{}"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright {yyyy} {name of copyright owner}
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/AUTHORS-LGPL b/AUTHORS-LGPL
deleted file mode 100644
index 4362b49151..0000000000
--- a/AUTHORS-LGPL
+++ /dev/null
@@ -1,502 +0,0 @@
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-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 this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. 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 not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-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
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the 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
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "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
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY 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
-LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey 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 library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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 library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
diff --git a/LICENSE b/LICENSE
deleted file mode 120000
index da24c5e4a6..0000000000
--- a/LICENSE
+++ /dev/null
@@ -1 +0,0 @@
-AUTHORS-ASL
\ No newline at end of file
diff --git a/NEWS b/NEWS.md
index 59c03c7ee8..d76a412908 100644
--- a/NEWS
+++ b/NEWS.md
@@ -1,6 +1,6 @@
-c-rbtree - Intrusive Red-Black Tree Collection
+# c-rbtree - Intrusive Red-Black Tree Collection
 
-CHANGES WITH 3:
+## CHANGES WITH 3:
 
         * Add more helpers. Add both a collection of iteratiors and helpers
           for initializing a tree and checking if a tree is empty, without
@@ -10,7 +10,7 @@ CHANGES WITH 3:
 
         - Berlin, 2017-08-13
 
-CHANGES WITH 2:
+## CHANGES WITH 2:
 
         * Relicense as ASL-2.0 to make c-rbtree useful for more projects. All
           code is now fully available under the ASL-2.0. Nothing is covered by
@@ -25,7 +25,7 @@ CHANGES WITH 2:
 
         - Berlin, 2016-12-14
 
-CHANGES WITH 1:
+## CHANGES WITH 1:
 
         * Initial release of c-rbtree.
 
diff --git a/README b/README
deleted file mode 100644
index 069e15c65c..0000000000
--- a/README
+++ /dev/null
@@ -1,52 +0,0 @@
-c-rbtree - Intrusive Red-Black Tree Collection
-
-ABOUT:
-        The c-rbtree project implements an intrusive collection based on
-        red-black trees in ISO-C11. Its API guarantees the user full control
-        over its data-structures, and rather limits itself to just the
-        tree-specific rebalancing and coloring operations.
-
-        For API documentation, see the c-rbtree.h header file, as well as the
-        docbook comments for each function.
-
-DETAILS:
-        https://c-util.github.io/c-rbtree
-
-BUG REPORTS:
-        https://github.com/c-util/c-rbtree/issues
-
-GIT:
-        git@github.com:c-util/c-rbtree.git
-        https://github.com/c-util/c-rbtree.git
-
-GITWEB:
-        https://github.com/c-util/c-rbtree
-
-LICENSE:
-        Apache Software License 2.0
-        Lesser General Public License 2.1+
-        See AUTHORS for details.
-
-REQUIREMENTS:
-        The requirements for c-siphash are:
-
-            libc (e.g., glibc >= 2.16)
-
-        At build-time, the following software is required:
-
-            meson >= 0.41
-            pkg-config >= 0.29
-
-INSTALL:
-        The meson build-system is used for this project. Contact upstream
-        documentation for detailed help. In most situations the following
-        commands are sufficient to build and install from source:
-
-            $ mkdir build
-            $ cd build
-            $ meson setup ..
-            $ ninja
-            $ meson test
-            # ninja install
-
-        No custom configuration options are available.
diff --git a/README.md b/README.md
new file mode 100644
index 0000000000..c725bbb8f4
--- /dev/null
+++ b/README.md
@@ -0,0 +1,54 @@
+c-rbtree
+========
+
+Intrusive Red-Black Tree Collection
+
+The c-rbtree project implements an intrusive collection based on red-black
+trees in ISO-C11. Its API guarantees the user full control over its
+data-structures, and rather limits itself to just the tree-specific rebalancing
+and coloring operations. For API documentation, see the c-rbtree.h header file,
+as well as the docbook comments for each function.
+
+### Project
+
+ * **Website**: <https://c-util.github.io/c-rbtree>
+ * **Bug Tracker**: <https://github.com/c-util/c-rbtree/issues>
+
+### Requirements
+
+The requirements for this project are:
+
+ * `libc` (e.g., `glibc >= 2.16`)
+
+At build-time, the following software is required:
+
+ * `meson >= 0.41`
+ * `pkg-config >= 0.29`
+
+### Build
+
+The meson build-system is used for this project. Contact upstream
+documentation for detailed help. In most situations the following
+commands are sufficient to build and install from source:
+
+```sh
+mkdir build
+cd build
+meson setup ..
+ninja
+meson test
+ninja install
+```
+
+No custom configuration options are available.
+
+### Repository:
+
+ - **web**:   <https://github.com/c-util/c-rbtree>
+ - **https**: `https://github.com/c-util/c-rbtree.git`
+ - **ssh**:   `git@github.com:c-util/c-rbtree.git`
+
+### License:
+
+ - **Apache-2.0** OR **LGPL-2.1-or-later**
+ - See AUTHORS file for details.
diff --git a/meson.build b/meson.build
index ce57651e4b..c131946762 100644
--- a/meson.build
+++ b/meson.build
@@ -12,4 +12,8 @@ project_description = 'Intrusive Red-Black Tree Collection'
 add_project_arguments('-D_GNU_SOURCE', language: 'c')
 mod_pkgconfig = import('pkgconfig')
 
+sub_cstdaux = subproject('c-stdaux')
+
+dep_cstdaux = sub_cstdaux.get_variable('libcstdaux_dep')
+
 subdir('src')
diff --git a/src/c-rbtree-private.h b/src/c-rbtree-private.h
index 25b9ba01c0..c9befbf37c 100644
--- a/src/c-rbtree-private.h
+++ b/src/c-rbtree-private.h
@@ -6,16 +6,11 @@
  * which are used by our test-suite.
  */
 
+#include <c-stdaux.h>
 #include <stddef.h>
 #include "c-rbtree.h"
 
 /*
- * Macros
- */
-
-#define _public_ __attribute__((__visibility__("default")))
-
-/*
  * Nodes
  */
 
diff --git a/src/c-rbtree.c b/src/c-rbtree.c
index f58db849b6..aacdcc2913 100644
--- a/src/c-rbtree.c
+++ b/src/c-rbtree.c
@@ -24,11 +24,11 @@
  */
 
 #include <assert.h>
+#include <c-stdaux.h>
 #include <stdalign.h>
 #include <stddef.h>
-
-#include "c-rbtree-private.h"
 #include "c-rbtree.h"
+#include "c-rbtree-private.h"
 
 /*
  * We use alignas(8) to enforce 64bit alignment of structure fields. This is
@@ -53,7 +53,7 @@ static_assert(alignof(CRBTree) >= 8, "Invalid CRBTree alignment");
  *
  * Return: Pointer to leftmost child, or NULL.
  */
-_public_ CRBNode *c_rbnode_leftmost(CRBNode *n) {
+_c_public_ CRBNode *c_rbnode_leftmost(CRBNode *n) {
         if (n)
                 while (n->left)
                         n = n->left;
@@ -72,7 +72,7 @@ _public_ CRBNode *c_rbnode_leftmost(CRBNode *n) {
  *
  * Return: Pointer to rightmost child, or NULL.
  */
-_public_ CRBNode *c_rbnode_rightmost(CRBNode *n) {
+_c_public_ CRBNode *c_rbnode_rightmost(CRBNode *n) {
         if (n)
                 while (n->right)
                         n = n->right;
@@ -94,7 +94,7 @@ _public_ CRBNode *c_rbnode_rightmost(CRBNode *n) {
  *
  * Return: Pointer to left-deepest child, or NULL.
  */
-_public_ CRBNode *c_rbnode_leftdeepest(CRBNode *n) {
+_c_public_ CRBNode *c_rbnode_leftdeepest(CRBNode *n) {
         if (n) {
                 for (;;) {
                         if (n->left)
@@ -123,7 +123,7 @@ _public_ CRBNode *c_rbnode_leftdeepest(CRBNode *n) {
  *
  * Return: Pointer to right-deepest child, or NULL.
  */
-_public_ CRBNode *c_rbnode_rightdeepest(CRBNode *n) {
+_c_public_ CRBNode *c_rbnode_rightdeepest(CRBNode *n) {
         if (n) {
                 for (;;) {
                         if (n->right)
@@ -149,7 +149,7 @@ _public_ CRBNode *c_rbnode_rightdeepest(CRBNode *n) {
  *
  * Return: Pointer to next node, or NULL.
  */
-_public_ CRBNode *c_rbnode_next(CRBNode *n) {
+_c_public_ CRBNode *c_rbnode_next(CRBNode *n) {
         CRBNode *p;
 
         if (!c_rbnode_is_linked(n))
@@ -175,7 +175,7 @@ _public_ CRBNode *c_rbnode_next(CRBNode *n) {
  *
  * Return: Pointer to previous node, or NULL.
  */
-_public_ CRBNode *c_rbnode_prev(CRBNode *n) {
+_c_public_ CRBNode *c_rbnode_prev(CRBNode *n) {
         CRBNode *p;
 
         if (!c_rbnode_is_linked(n))
@@ -209,7 +209,7 @@ _public_ CRBNode *c_rbnode_prev(CRBNode *n) {
  *
  * Return: Pointer to next node, or NULL.
  */
-_public_ CRBNode *c_rbnode_next_postorder(CRBNode *n) {
+_c_public_ CRBNode *c_rbnode_next_postorder(CRBNode *n) {
         CRBNode *p;
 
         if (!c_rbnode_is_linked(n))
@@ -253,7 +253,7 @@ _public_ CRBNode *c_rbnode_next_postorder(CRBNode *n) {
  *
  * Return: Pointer to previous node in post-order, or NULL.
  */
-_public_ CRBNode *c_rbnode_prev_postorder(CRBNode *n) {
+_c_public_ CRBNode *c_rbnode_prev_postorder(CRBNode *n) {
         CRBNode *p;
 
         if (!c_rbnode_is_linked(n))
@@ -283,8 +283,8 @@ _public_ CRBNode *c_rbnode_prev_postorder(CRBNode *n) {
  *
  * Return: Pointer to first node, or NULL.
  */
-_public_ CRBNode *c_rbtree_first(CRBTree *t) {
-        assert(t);
+_c_public_ CRBNode *c_rbtree_first(CRBTree *t) {
+        c_assert(t);
         return c_rbnode_leftmost(t->root);
 }
 
@@ -299,8 +299,8 @@ _public_ CRBNode *c_rbtree_first(CRBTree *t) {
  *
  * Return: Pointer to last node, or NULL.
  */
-_public_ CRBNode *c_rbtree_last(CRBTree *t) {
-        assert(t);
+_c_public_ CRBNode *c_rbtree_last(CRBTree *t) {
+        c_assert(t);
         return c_rbnode_rightmost(t->root);
 }
 
@@ -319,8 +319,8 @@ _public_ CRBNode *c_rbtree_last(CRBTree *t) {
  *
  * Return: Pointer to first node in post-order, or NULL.
  */
-_public_ CRBNode *c_rbtree_first_postorder(CRBTree *t) {
-        assert(t);
+_c_public_ CRBNode *c_rbtree_first_postorder(CRBTree *t) {
+        c_assert(t);
         return c_rbnode_leftdeepest(t->root);
 }
 
@@ -338,8 +338,8 @@ _public_ CRBNode *c_rbtree_first_postorder(CRBTree *t) {
  *
  * Return: Pointer to last node in post-order, or NULL.
  */
-_public_ CRBNode *c_rbtree_last_postorder(CRBTree *t) {
-        assert(t);
+_c_public_ CRBNode *c_rbtree_last_postorder(CRBTree *t) {
+        c_assert(t);
         return t->root;
 }
 
@@ -452,14 +452,14 @@ static inline void c_rbnode_swap_child(CRBNode *old, CRBNode *new) {
  * Note that this operates in O(1) time. Only the root-entry is updated to
  * point to the new tree-root.
  */
-_public_ void c_rbtree_move(CRBTree *to, CRBTree *from) {
+_c_public_ void c_rbtree_move(CRBTree *to, CRBTree *from) {
         CRBTree *t;
 
-        assert(!to->root);
+        c_assert(!to->root);
 
         if (from->root) {
                 t = c_rbnode_pop_root(from->root);
-                assert(t == from);
+                c_assert(t == from);
 
                 to->root = from->root;
                 from->root = NULL;
@@ -486,10 +486,10 @@ static inline void c_rbtree_paint_terminal(CRBNode *n) {
         g = c_rbnode_parent(p);
         gg = c_rbnode_parent(g);
 
-        assert(c_rbnode_is_red(p));
-        assert(c_rbnode_is_black(g));
-        assert(p == g->left || !g->left || c_rbnode_is_black(g->left));
-        assert(p == g->right || !g->right || c_rbnode_is_black(g->right));
+        c_assert(c_rbnode_is_red(p));
+        c_assert(c_rbnode_is_black(g));
+        c_assert(p == g->left || !g->left || c_rbnode_is_black(g->left));
+        c_assert(p == g->right || !g->right || c_rbnode_is_black(g->right));
 
         if (p == g->left) {
                 if (n == p->right) {
@@ -673,11 +673,11 @@ static inline void c_rbtree_paint(CRBNode *n) {
  * In most cases you are better off using c_rbtree_add(). See there for details
  * how tree-insertion works.
  */
-_public_ void c_rbnode_link(CRBNode *p, CRBNode **l, CRBNode *n) {
-        assert(p);
-        assert(l);
-        assert(n);
-        assert(l == &p->left || l == &p->right);
+_c_public_ void c_rbnode_link(CRBNode *p, CRBNode **l, CRBNode *n) {
+        c_assert(p);
+        c_assert(l);
+        c_assert(n);
+        c_assert(l == &p->left || l == &p->right);
 
         c_rbnode_set_parent_and_flags(n, p, C_RBNODE_RED);
         c_rbtree_store(&n->left, NULL);
@@ -738,12 +738,12 @@ _public_ void c_rbnode_link(CRBNode *p, CRBNode **l, CRBNode *n) {
  * than c_rbnode_unlink_stale()). In those cases, you should validate that a
  * node is unlinked before you call c_rbtree_add().
  */
-_public_ void c_rbtree_add(CRBTree *t, CRBNode *p, CRBNode **l, CRBNode *n) {
-        assert(t);
-        assert(l);
-        assert(n);
-        assert(!p || l == &p->left || l == &p->right);
-        assert(p || l == &t->root);
+_c_public_ void c_rbtree_add(CRBTree *t, CRBNode *p, CRBNode **l, CRBNode *n) {
+        c_assert(t);
+        c_assert(l);
+        c_assert(n);
+        c_assert(!p || l == &p->left || l == &p->right);
+        c_assert(p || l == &t->root);
 
         c_rbnode_set_parent_and_flags(n, p, C_RBNODE_RED);
         c_rbtree_store(&n->left, NULL);
@@ -795,7 +795,7 @@ static inline void c_rbnode_rebalance_terminal(CRBNode *p, CRBNode *previous) {
                                  * Note that the parent must be red, otherwise
                                  * it must have been handled by our caller.
                                  */
-                                assert(c_rbnode_is_red(p));
+                                c_assert(c_rbnode_is_red(p));
                                 c_rbnode_set_parent_and_flags(s, p, c_rbnode_flags(s) | C_RBNODE_RED);
                                 c_rbnode_set_parent_and_flags(p, c_rbnode_parent(p), c_rbnode_flags(p) & ~C_RBNODE_RED);
                                 return;
@@ -855,7 +855,7 @@ static inline void c_rbnode_rebalance_terminal(CRBNode *p, CRBNode *previous) {
                 if (!x || c_rbnode_is_black(x)) {
                         y = s->right;
                         if (!y || c_rbnode_is_black(y)) {
-                                assert(c_rbnode_is_red(p));
+                                c_assert(c_rbnode_is_red(p));
                                 c_rbnode_set_parent_and_flags(s, p, c_rbnode_flags(s) | C_RBNODE_RED);
                                 c_rbnode_set_parent_and_flags(p, c_rbnode_parent(p), c_rbnode_flags(p) & ~C_RBNODE_RED);
                                 return;
@@ -962,11 +962,11 @@ static inline void c_rbnode_rebalance(CRBNode *n) {
  * This does *NOT* reset @n to being unlinked. If you need this, use
  * c_rbtree_unlink().
  */
-_public_ void c_rbnode_unlink_stale(CRBNode *n) {
+_c_public_ void c_rbnode_unlink_stale(CRBNode *n) {
         CRBTree *t;
 
-        assert(n);
-        assert(c_rbnode_is_linked(n));
+        c_assert(n);
+        c_assert(c_rbnode_is_linked(n));
 
         /*
          * There are three distinct cases during node removal of a tree:
diff --git a/src/meson.build b/src/meson.build
index 47ccf63aaa..d0b4d63ce9 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -4,6 +4,10 @@
 
 libcrbtree_symfile = join_paths(meson.current_source_dir(), 'libcrbtree.sym')
 
+libcrbtree_deps = [
+        dep_cstdaux,
+]
+
 libcrbtree_private = static_library(
         'crbtree-private',
         [
@@ -13,12 +17,14 @@ libcrbtree_private = static_library(
                 '-fvisibility=hidden',
                 '-fno-common',
         ],
+        dependencies: libcrbtree_deps,
         pic: true,
 )
 
 libcrbtree_shared = shared_library(
         'crbtree',
         objects: libcrbtree_private.extract_all_objects(),
+        dependencies: libcrbtree_deps,
         install: not meson.is_subproject(),
         soversion: 0,
         link_depends: libcrbtree_symfile,
@@ -31,6 +37,7 @@ libcrbtree_shared = shared_library(
 libcrbtree_dep = declare_dependency(
         include_directories: include_directories('.'),
         link_with: libcrbtree_private,
+        dependencies: libcrbtree_deps,
         version: meson.project_version(),
 )
 
diff --git a/src/test-api.c b/src/test-api.c
index 55c37af6c4..295f6b9b4c 100644
--- a/src/test-api.c
+++ b/src/test-api.c
@@ -9,7 +9,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-
 #include "c-rbtree.h"
 
 typedef struct TestNode {
diff --git a/src/test-basic.c b/src/test-basic.c
index 534a10966f..8fee646820 100644
--- a/src/test-basic.c
+++ b/src/test-basic.c
@@ -10,11 +10,11 @@
 
 #undef NDEBUG
 #include <assert.h>
+#include <c-stdaux.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-
 #include "c-rbtree.h"
 #include "c-rbtree-private.h"
 
@@ -23,8 +23,8 @@ static size_t validate(CRBTree *t) {
         CRBNode *n, *p, *o;
         size_t count = 0;
 
-        assert(t);
-        assert(!t->root || c_rbnode_is_black(t->root));
+        c_assert(t);
+        c_assert(!t->root || c_rbnode_is_black(t->root));
 
         /* traverse to left-most child, count black nodes */
         i_black = 0;
@@ -52,29 +52,29 @@ static size_t validate(CRBTree *t) {
                 ++count;
 
                 /* verify natural order */
-                assert(n > o);
+                c_assert(n > o);
                 o = n;
 
                 /* verify consistency */
-                assert(!n->right || c_rbnode_parent(n->right) == n);
-                assert(!n->left || c_rbnode_parent(n->left) == n);
+                c_assert(!n->right || c_rbnode_parent(n->right) == n);
+                c_assert(!n->left || c_rbnode_parent(n->left) == n);
 
                 /* verify 2) */
                 if (!c_rbnode_parent(n))
-                        assert(c_rbnode_is_black(n));
+                        c_assert(c_rbnode_is_black(n));
 
                 if (c_rbnode_is_red(n)) {
                         /* verify 4) */
-                        assert(!n->left || c_rbnode_is_black(n->left));
-                        assert(!n->right || c_rbnode_is_black(n->right));
+                        c_assert(!n->left || c_rbnode_is_black(n->left));
+                        c_assert(!n->right || c_rbnode_is_black(n->right));
                 } else {
                         /* verify 1) */
-                        assert(c_rbnode_is_black(n));
+                        c_assert(c_rbnode_is_black(n));
                 }
 
                 /* verify 5) */
                 if (!n->left && !n->right)
-                        assert(i_black == n_black);
+                        c_assert(i_black == n_black);
 
                 /* get next node */
                 if (n->right) {
@@ -106,9 +106,9 @@ static size_t validate(CRBTree *t) {
 static void insert(CRBTree *t, CRBNode *n) {
         CRBNode **i, *p;
 
-        assert(t);
-        assert(n);
-        assert(!c_rbnode_is_linked(n));
+        c_assert(t);
+        c_assert(n);
+        c_assert(!c_rbnode_is_linked(n));
 
         i = &t->root;
         p = NULL;
@@ -117,7 +117,7 @@ static void insert(CRBTree *t, CRBNode *n) {
                 if (n < *i) {
                         i = &(*i)->left;
                 } else {
-                        assert(n > *i);
+                        c_assert(n > *i);
                         i = &(*i)->right;
                 }
         }
@@ -146,20 +146,20 @@ static void test_shuffle(void) {
         /* allocate and initialize all nodes */
         for (i = 0; i < sizeof(nodes) / sizeof(*nodes); ++i) {
                 nodes[i] = malloc(sizeof(*nodes[i]));
-                assert(nodes[i]);
+                c_assert(nodes[i]);
                 c_rbnode_init(nodes[i]);
         }
 
         /* shuffle nodes and validate *empty* tree */
         shuffle(nodes, sizeof(nodes) / sizeof(*nodes));
         n = validate(&t);
-        assert(n == 0);
+        c_assert(n == 0);
 
         /* add all nodes and validate after each insertion */
         for (i = 0; i < sizeof(nodes) / sizeof(*nodes); ++i) {
                 insert(&t, nodes[i]);
                 n = validate(&t);
-                assert(n == i + 1);
+                c_assert(n == i + 1);
         }
 
         /* shuffle nodes again */
@@ -169,19 +169,19 @@ static void test_shuffle(void) {
         for (i = 0; i < sizeof(nodes) / sizeof(*nodes); ++i) {
                 c_rbnode_unlink(nodes[i]);
                 n = validate(&t);
-                assert(n == sizeof(nodes) / sizeof(*nodes) - i - 1);
+                c_assert(n == sizeof(nodes) / sizeof(*nodes) - i - 1);
         }
 
         /* shuffle nodes and validate *empty* tree again */
         shuffle(nodes, sizeof(nodes) / sizeof(*nodes));
         n = validate(&t);
-        assert(n == 0);
+        c_assert(n == 0);
 
         /* add all nodes again */
         for (i = 0; i < sizeof(nodes) / sizeof(*nodes); ++i) {
                 insert(&t, nodes[i]);
                 n = validate(&t);
-                assert(n == i + 1);
+                c_assert(n == i + 1);
         }
 
         /* 4 times, remove half of the nodes and add them again */
@@ -193,7 +193,7 @@ static void test_shuffle(void) {
                 for (i = 0; i < sizeof(nodes) / sizeof(*nodes) / 2; ++i) {
                         c_rbnode_unlink(nodes[i]);
                         n = validate(&t);
-                        assert(n == sizeof(nodes) / sizeof(*nodes) - i - 1);
+                        c_assert(n == sizeof(nodes) / sizeof(*nodes) - i - 1);
                 }
 
                 /* shuffle the removed half */
@@ -203,7 +203,7 @@ static void test_shuffle(void) {
                 for (i = 0; i < sizeof(nodes) / sizeof(*nodes) / 2; ++i) {
                         insert(&t, nodes[i]);
                         n = validate(&t);
-                        assert(n == sizeof(nodes) / sizeof(*nodes) / 2 + i + 1);
+                        c_assert(n == sizeof(nodes) / sizeof(*nodes) / 2 + i + 1);
                 }
         }
 
@@ -214,7 +214,7 @@ static void test_shuffle(void) {
         for (i = 0; i < sizeof(nodes) / sizeof(*nodes); ++i) {
                 c_rbnode_unlink(nodes[i]);
                 n = validate(&t);
-                assert(n == sizeof(nodes) / sizeof(*nodes) - i - 1);
+                c_assert(n == sizeof(nodes) / sizeof(*nodes) - i - 1);
         }
 
         /* free nodes again */
diff --git a/src/test-map.c b/src/test-map.c
index 3601ee495e..48a300d6f4 100644
--- a/src/test-map.c
+++ b/src/test-map.c
@@ -6,11 +6,11 @@
 
 #undef NDEBUG
 #include <assert.h>
+#include <c-stdaux.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-
 #include "c-rbtree.h"
 #include "c-rbtree-private.h"
 
@@ -50,7 +50,7 @@ static void test_map(void) {
         /* allocate and initialize all nodes */
         for (i = 0; i < sizeof(nodes) / sizeof(*nodes); ++i) {
                 nodes[i] = malloc(sizeof(*nodes[i]));
-                assert(nodes[i]);
+                c_assert(nodes[i]);
                 nodes[i]->key = i;
                 nodes[i]->marker = 0;
                 c_rbnode_init(&nodes[i]->rb);
@@ -61,15 +61,15 @@ static void test_map(void) {
 
         /* add all nodes, and verify that each node is linked */
         for (i = 0; i < sizeof(nodes) / sizeof(*nodes); ++i) {
-                assert(!c_rbnode_is_linked(&nodes[i]->rb));
-                assert(!c_rbtree_find_entry(&t, test_compare, (void *)nodes[i]->key, Node, rb));
+                c_assert(!c_rbnode_is_linked(&nodes[i]->rb));
+                c_assert(!c_rbtree_find_entry(&t, test_compare, (void *)nodes[i]->key, Node, rb));
 
                 slot = c_rbtree_find_slot(&t, test_compare, (void *)nodes[i]->key, &p);
-                assert(slot);
+                c_assert(slot);
                 c_rbtree_add(&t, p, slot, &nodes[i]->rb);
 
-                assert(c_rbnode_is_linked(&nodes[i]->rb));
-                assert(nodes[i] == c_rbtree_find_entry(&t, test_compare, (void *)nodes[i]->key, Node, rb));
+                c_assert(c_rbnode_is_linked(&nodes[i]->rb));
+                c_assert(nodes[i] == c_rbtree_find_entry(&t, test_compare, (void *)nodes[i]->key, Node, rb));
         }
 
         /* verify in-order traversal works */
@@ -77,128 +77,128 @@ static void test_map(void) {
         v = 0;
         for (p = c_rbtree_first(&t); p; p = c_rbnode_next(p)) {
                 ++i;
-                assert(!node_from_rb(p)->marker);
+                c_assert(!node_from_rb(p)->marker);
                 node_from_rb(p)->marker = 1;
 
-                assert(v <= node_from_rb(p)->key);
+                c_assert(v <= node_from_rb(p)->key);
                 v = node_from_rb(p)->key;
 
-                assert(!c_rbnode_next(p) || p == c_rbnode_prev(c_rbnode_next(p)));
+                c_assert(!c_rbnode_next(p) || p == c_rbnode_prev(c_rbnode_next(p)));
         }
-        assert(i == sizeof(nodes) / sizeof(*nodes));
+        c_assert(i == sizeof(nodes) / sizeof(*nodes));
 
         /* verify reverse in-order traversal works */
         i = 0;
         v = -1;
         for (p = c_rbtree_last(&t); p; p = c_rbnode_prev(p)) {
                 ++i;
-                assert(node_from_rb(p)->marker);
+                c_assert(node_from_rb(p)->marker);
                 node_from_rb(p)->marker = 0;
 
-                assert(v >= node_from_rb(p)->key);
+                c_assert(v >= node_from_rb(p)->key);
                 v = node_from_rb(p)->key;
         }
-        assert(i == sizeof(nodes) / sizeof(*nodes));
+        c_assert(i == sizeof(nodes) / sizeof(*nodes));
 
         /* verify post-order traversal works */
         i = 0;
         for (p = c_rbtree_first_postorder(&t); p; p = c_rbnode_next_postorder(p)) {
                 ++i;
-                assert(!node_from_rb(p)->marker);
-                assert(!c_rbnode_parent(p) || !node_from_rb(c_rbnode_parent(p))->marker);
-                assert(!p->left || node_from_rb(p->left)->marker);
-                assert(!p->right || node_from_rb(p->right)->marker);
+                c_assert(!node_from_rb(p)->marker);
+                c_assert(!c_rbnode_parent(p) || !node_from_rb(c_rbnode_parent(p))->marker);
+                c_assert(!p->left || node_from_rb(p->left)->marker);
+                c_assert(!p->right || node_from_rb(p->right)->marker);
                 node_from_rb(p)->marker = 1;
 
-                assert(!c_rbnode_next_postorder(p) || p == c_rbnode_prev_postorder(c_rbnode_next_postorder(p)));
+                c_assert(!c_rbnode_next_postorder(p) || p == c_rbnode_prev_postorder(c_rbnode_next_postorder(p)));
         }
-        assert(i == sizeof(nodes) / sizeof(*nodes));
+        c_assert(i == sizeof(nodes) / sizeof(*nodes));
 
         /* verify pre-order (inverse post-order) traversal works */
         i = 0;
         for (p = c_rbtree_last_postorder(&t); p; p = c_rbnode_prev_postorder(p)) {
                 ++i;
-                assert(node_from_rb(p)->marker);
-                assert(!c_rbnode_parent(p) || !node_from_rb(c_rbnode_parent(p))->marker);
-                assert(!p->left || node_from_rb(p->left)->marker);
-                assert(!p->right || node_from_rb(p->right)->marker);
+                c_assert(node_from_rb(p)->marker);
+                c_assert(!c_rbnode_parent(p) || !node_from_rb(c_rbnode_parent(p))->marker);
+                c_assert(!p->left || node_from_rb(p->left)->marker);
+                c_assert(!p->right || node_from_rb(p->right)->marker);
                 node_from_rb(p)->marker = 0;
         }
-        assert(i == sizeof(nodes) / sizeof(*nodes));
+        c_assert(i == sizeof(nodes) / sizeof(*nodes));
 
         /* verify in-order traversal works via helper */
         i = 0;
         v = 0;
         c_rbtree_for_each(p, &t) {
                 ++i;
-                assert(!node_from_rb(p)->marker);
+                c_assert(!node_from_rb(p)->marker);
                 node_from_rb(p)->marker = 1;
 
-                assert(v <= node_from_rb(p)->key);
+                c_assert(v <= node_from_rb(p)->key);
                 v = node_from_rb(p)->key;
 
-                assert(!c_rbnode_next(p) || p == c_rbnode_prev(c_rbnode_next(p)));
+                c_assert(!c_rbnode_next(p) || p == c_rbnode_prev(c_rbnode_next(p)));
         }
-        assert(i == sizeof(nodes) / sizeof(*nodes));
+        c_assert(i == sizeof(nodes) / sizeof(*nodes));
 
         /* verify in-order traversal works via entry-helper */
         i = 0;
         v = 0;
         c_rbtree_for_each_entry(n, &t, rb) {
                 ++i;
-                assert(n->marker);
+                c_assert(n->marker);
                 n->marker = 0;
 
-                assert(v <= n->key);
+                c_assert(v <= n->key);
                 v = n->key;
         }
-        assert(i == sizeof(nodes) / sizeof(*nodes));
+        c_assert(i == sizeof(nodes) / sizeof(*nodes));
 
         /* verify post-order traversal works via helper */
         i = 0;
         c_rbtree_for_each_postorder(p, &t) {
                 ++i;
-                assert(!node_from_rb(p)->marker);
-                assert(!c_rbnode_parent(p) || !node_from_rb(c_rbnode_parent(p))->marker);
-                assert(!p->left || node_from_rb(p->left)->marker);
-                assert(!p->right || node_from_rb(p->right)->marker);
+                c_assert(!node_from_rb(p)->marker);
+                c_assert(!c_rbnode_parent(p) || !node_from_rb(c_rbnode_parent(p))->marker);
+                c_assert(!p->left || node_from_rb(p->left)->marker);
+                c_assert(!p->right || node_from_rb(p->right)->marker);
                 node_from_rb(p)->marker = 1;
 
-                assert(!c_rbnode_next_postorder(p) || p == c_rbnode_prev_postorder(c_rbnode_next_postorder(p)));
+                c_assert(!c_rbnode_next_postorder(p) || p == c_rbnode_prev_postorder(c_rbnode_next_postorder(p)));
         }
-        assert(i == sizeof(nodes) / sizeof(*nodes));
+        c_assert(i == sizeof(nodes) / sizeof(*nodes));
 
         /* verify post-order traversal works via entry-helper */
         i = 0;
         c_rbtree_for_each_entry_postorder(n, &t, rb) {
                 ++i;
-                assert(n->marker);
-                assert(!c_rbnode_parent(&n->rb) || node_from_rb(c_rbnode_parent(&n->rb))->marker);
-                assert(!n->rb.left || !node_from_rb(n->rb.left)->marker);
-                assert(!n->rb.right || !node_from_rb(n->rb.right)->marker);
+                c_assert(n->marker);
+                c_assert(!c_rbnode_parent(&n->rb) || node_from_rb(c_rbnode_parent(&n->rb))->marker);
+                c_assert(!n->rb.left || !node_from_rb(n->rb.left)->marker);
+                c_assert(!n->rb.right || !node_from_rb(n->rb.right)->marker);
                 n->marker = 0;
         }
-        assert(i == sizeof(nodes) / sizeof(*nodes));
+        c_assert(i == sizeof(nodes) / sizeof(*nodes));
 
         /* shuffle nodes again */
         shuffle(nodes, sizeof(nodes) / sizeof(*nodes));
 
         /* remove all nodes (in different order) */
         for (i = 0; i < sizeof(nodes) / sizeof(*nodes); ++i) {
-                assert(c_rbnode_is_linked(&nodes[i]->rb));
-                assert(nodes[i] == c_rbtree_find_entry(&t, test_compare, (void *)nodes[i]->key, Node, rb));
+                c_assert(c_rbnode_is_linked(&nodes[i]->rb));
+                c_assert(nodes[i] == c_rbtree_find_entry(&t, test_compare, (void *)nodes[i]->key, Node, rb));
 
                 c_rbnode_unlink(&nodes[i]->rb);
 
-                assert(!c_rbnode_is_linked(&nodes[i]->rb));
-                assert(!c_rbtree_find_entry(&t, test_compare, (void *)nodes[i]->key, Node, rb));
+                c_assert(!c_rbnode_is_linked(&nodes[i]->rb));
+                c_assert(!c_rbtree_find_entry(&t, test_compare, (void *)nodes[i]->key, Node, rb));
         }
-        assert(c_rbtree_is_empty(&t));
+        c_assert(c_rbtree_is_empty(&t));
 
         /* add all nodes again */
         for (i = 0; i < sizeof(nodes) / sizeof(*nodes); ++i) {
                 slot = c_rbtree_find_slot(&t, test_compare, (void *)nodes[i]->key, &p);
-                assert(slot);
+                c_assert(slot);
                 c_rbtree_add(&t, p, slot, &nodes[i]->rb);
         }
 
@@ -208,13 +208,13 @@ static void test_map(void) {
                 ++i;
                 c_rbnode_unlink(p);
         }
-        assert(i == sizeof(nodes) / sizeof(*nodes));
-        assert(c_rbtree_is_empty(&t));
+        c_assert(i == sizeof(nodes) / sizeof(*nodes));
+        c_assert(c_rbtree_is_empty(&t));
 
         /* add all nodes again */
         for (i = 0; i < sizeof(nodes) / sizeof(*nodes); ++i) {
                 slot = c_rbtree_find_slot(&t, test_compare, (void *)nodes[i]->key, &p);
-                assert(slot);
+                c_assert(slot);
                 c_rbtree_add(&t, p, slot, &nodes[i]->rb);
         }
 
@@ -224,13 +224,13 @@ static void test_map(void) {
                 ++i;
                 c_rbnode_unlink(&n->rb);
         }
-        assert(i == sizeof(nodes) / sizeof(*nodes));
-        assert(c_rbtree_is_empty(&t));
+        c_assert(i == sizeof(nodes) / sizeof(*nodes));
+        c_assert(c_rbtree_is_empty(&t));
 
         /* add all nodes again */
         for (i = 0; i < sizeof(nodes) / sizeof(*nodes); ++i) {
                 slot = c_rbtree_find_slot(&t, test_compare, (void *)nodes[i]->key, &p);
-                assert(slot);
+                c_assert(slot);
                 c_rbtree_add(&t, p, slot, &nodes[i]->rb);
         }
 
@@ -238,15 +238,15 @@ static void test_map(void) {
         i = 0;
         c_rbtree_for_each_safe_postorder_unlink(p, safe_p, &t) {
                 ++i;
-                assert(!c_rbnode_is_linked(p));
+                c_assert(!c_rbnode_is_linked(p));
         }
-        assert(i == sizeof(nodes) / sizeof(*nodes));
-        assert(c_rbtree_is_empty(&t));
+        c_assert(i == sizeof(nodes) / sizeof(*nodes));
+        c_assert(c_rbtree_is_empty(&t));
 
         /* add all nodes again */
         for (i = 0; i < sizeof(nodes) / sizeof(*nodes); ++i) {
                 slot = c_rbtree_find_slot(&t, test_compare, (void *)nodes[i]->key, &p);
-                assert(slot);
+                c_assert(slot);
                 c_rbtree_add(&t, p, slot, &nodes[i]->rb);
         }
 
@@ -254,18 +254,18 @@ static void test_map(void) {
         i = 0;
         c_rbtree_for_each_entry_safe_postorder_unlink(n, safe_n, &t, rb) {
                 ++i;
-                assert(!c_rbnode_is_linked(&n->rb));
+                c_assert(!c_rbnode_is_linked(&n->rb));
         }
-        assert(i == sizeof(nodes) / sizeof(*nodes));
-        assert(c_rbtree_is_empty(&t));
+        c_assert(i == sizeof(nodes) / sizeof(*nodes));
+        c_assert(c_rbtree_is_empty(&t));
 
         /* free nodes again */
         for (i = 0; i < sizeof(nodes) / sizeof(*nodes); ++i) {
-                assert(!nodes[i]->marker);
+                c_assert(!nodes[i]->marker);
                 free(nodes[i]);
         }
 
-        assert(c_rbtree_is_empty(&t));
+        c_assert(c_rbtree_is_empty(&t));
 }
 
 int main(int argc, char **argv) {
diff --git a/src/test-misc.c b/src/test-misc.c
index e5b3289c3c..ac2717cdc0 100644
--- a/src/test-misc.c
+++ b/src/test-misc.c
@@ -5,19 +5,19 @@
 
 #undef NDEBUG
 #include <assert.h>
+#include <c-stdaux.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-
 #include "c-rbtree.h"
 #include "c-rbtree-private.h"
 
 static void insert(CRBTree *t, CRBNode *n) {
         CRBNode **i, *p;
 
-        assert(t);
-        assert(n);
-        assert(!c_rbnode_is_linked(n));
+        c_assert(t);
+        c_assert(n);
+        c_assert(!c_rbnode_is_linked(n));
 
         i = &t->root;
         p = NULL;
@@ -26,7 +26,7 @@ static void insert(CRBTree *t, CRBNode *n) {
                 if (n < *i) {
                         i = &(*i)->left;
                 } else {
-                        assert(n > *i);
+                        c_assert(n > *i);
                         i = &(*i)->right;
                 }
         }
@@ -44,19 +44,19 @@ static void test_move(void) {
                 insert(&t1, &n[i]);
         }
 
-        assert(!c_rbtree_is_empty(&t1));
-        assert(c_rbtree_is_empty(&t2));
+        c_assert(!c_rbtree_is_empty(&t1));
+        c_assert(c_rbtree_is_empty(&t2));
 
         c_rbtree_move(&t2, &t1);
 
-        assert(c_rbtree_is_empty(&t1));
-        assert(!c_rbtree_is_empty(&t2));
+        c_assert(c_rbtree_is_empty(&t1));
+        c_assert(!c_rbtree_is_empty(&t2));
 
         while (t2.root)
                 c_rbnode_unlink(t2.root);
 
-        assert(c_rbtree_is_empty(&t1));
-        assert(c_rbtree_is_empty(&t2));
+        c_assert(c_rbtree_is_empty(&t1));
+        c_assert(c_rbtree_is_empty(&t2));
 }
 
 int main(int argc, char **argv) {
diff --git a/src/test-parallel.c b/src/test-parallel.c
index 4513d9ece2..1388722bf3 100644
--- a/src/test-parallel.c
+++ b/src/test-parallel.c
@@ -30,6 +30,7 @@
 
 #undef NDEBUG
 #include <assert.h>
+#include <c-stdaux.h>
 #include <errno.h>
 #include <inttypes.h>
 #include <sched.h>
@@ -46,7 +47,6 @@
 #include <sys/syscall.h>
 #include <time.h>
 #include <unistd.h>
-
 #include "c-rbtree.h"
 #include "c-rbtree-private.h"
 
@@ -132,7 +132,7 @@ static void test_parent_start(TestContext *ctx) {
         ctx->mapsize += ctx->n_nodes * sizeof(CRBNode*);
 
         ctx->map = mmap(NULL, ctx->mapsize, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
-        assert(ctx->map != MAP_FAILED);
+        c_assert(ctx->map != MAP_FAILED);
 
         ctx->tree = (void *)ctx->map;
         ctx->node_mem = (void *)(ctx->tree + 1);
@@ -161,10 +161,10 @@ static void test_parent_end(TestContext *ctx) {
         int r;
 
         for (i = 0; i < ctx->n_nodes; ++i)
-                assert(!c_rbnode_is_linked(ctx->nodes[i]));
+                c_assert(!c_rbnode_is_linked(ctx->nodes[i]));
 
         r = munmap(ctx->map, ctx->mapsize);
-        assert(r >= 0);
+        c_assert(r >= 0);
 }
 
 static void test_parent_step(TestContext *ctx) {
@@ -176,13 +176,13 @@ static void test_parent_step(TestContext *ctx) {
 
         while (n) {
                 /* verify that we haven't visited @n, yet */
-                assert(!fetch_visit(n));
+                c_assert(!fetch_visit(n));
 
                 /* verify @n is a valid node */
                 for (i = 0; i < ctx->n_nodes; ++i)
                         if (n == ctx->nodes[i])
                                 break;
-                assert(i < ctx->n_nodes);
+                c_assert(i < ctx->n_nodes);
 
                 /* pre-order traversal and marker for cycle detection */
                 if (n->left) {
@@ -256,7 +256,7 @@ static int test_parallel(void) {
 
         /* run child */
         pid = fork();
-        assert(pid >= 0);
+        c_assert(pid >= 0);
         if (pid == 0) {
                 r = test_parallel_child(&ctx);
                 _exit(r);
@@ -293,7 +293,7 @@ static int test_parallel(void) {
                         if (r < 0 && errno == EIO)
                                 return 77;
 
-                        assert(r >= 0);
+                        c_assert(r >= 0);
                         break;
 
                 case SIGURG:
@@ -302,7 +302,7 @@ static int test_parallel(void) {
 
                         /* step child */
                         r = ptrace(PTRACE_SINGLESTEP, pid, 0, 0);
-                        assert(r >= 0);
+                        c_assert(r >= 0);
                         break;
 
                 case SIGUSR2:
@@ -311,7 +311,7 @@ static int test_parallel(void) {
 
                         /* continue child */
                         r = ptrace(PTRACE_CONT, pid, 0, 0);
-                        assert(r >= 0);
+                        c_assert(r >= 0);
                         break;
 
                 case SIGTRAP:
@@ -320,18 +320,18 @@ static int test_parallel(void) {
 
                         /* step repeatedly as long as we get SIGTRAP */
                         r = ptrace(PTRACE_SINGLESTEP, pid, 0, 0);
-                        assert(r >= 0);
+                        c_assert(r >= 0);
                         break;
 
                 default:
-                        assert(0);
+                        c_assert(0);
                         break;
                 }
         }
 
         /* verify our child exited cleanly */
-        assert(r == pid);
-        assert(!!WIFEXITED(status));
+        c_assert(r == pid);
+        c_assert(!!WIFEXITED(status));
 
         /*
          * 0xdf is signalled if ptrace is not allowed or we are already
@@ -347,15 +347,15 @@ static int test_parallel(void) {
         case 0xdf:
                 return 77;
         default:
-                assert(0);
+                c_assert(0);
                 break;
         }
 
         /* verify we hit all child states */
-        assert(n_event & 0x1);
-        assert(n_event & 0x2);
-        assert(n_event & 0x4);
-        assert(n_instr > 0);
+        c_assert(n_event & 0x1);
+        c_assert(n_event & 0x2);
+        c_assert(n_event & 0x4);
+        c_assert(n_instr > 0);
 
         return 0;
 }
diff --git a/src/test-posix.c b/src/test-posix.c
index 213d85fefe..ee100ec52e 100644
--- a/src/test-posix.c
+++ b/src/test-posix.c
@@ -42,6 +42,7 @@
 
 #undef NDEBUG
 #include <assert.h>
+#include <c-stdaux.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <search.h>
@@ -49,7 +50,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-
 #include "c-rbtree.h"
 #include "c-rbtree-private.h"
 
@@ -85,7 +85,7 @@ static uint64_t now(void) {
         int r;
 
         r = clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts);
-        assert(r >= 0);
+        c_assert(r >= 0);
         return ts.tv_sec * UINT64_C(1000000000) + ts.tv_nsec;
 }
 
@@ -116,14 +116,14 @@ static void posix_rbtree_add(PosixRBTree *t, const Node *node) {
         void *res;
 
         res = tsearch(&node->key, &t->root, posix_rbtree_compare);
-        assert(*(int **)res == &node->key);
+        c_assert(*(int **)res == &node->key);
 }
 
 static void posix_rbtree_remove(PosixRBTree *t, const Node *node) {
         void *res;
 
         res = tdelete(&node->key, &t->root, posix_rbtree_compare);
-        assert(res);
+        c_assert(res);
 }
 
 static Node *posix_rbtree_find(PosixRBTree *t, int key) {
@@ -143,7 +143,7 @@ static void posix_rbtree_visit(const void *n, const VISIT o, const int depth) {
         switch (o) {
         case postorder:
         case leaf:
-                assert(v <= node_from_key(*(int **)n)->key);
+                c_assert(v <= node_from_key(*(int **)n)->key);
                 v = node_from_key(*(int **)n)->key;
                 break;
         default:
@@ -178,7 +178,7 @@ static void test_posix(void) {
         /* allocate and initialize all nodes */
         for (i = 0; i < sizeof(nodes) / sizeof(*nodes); ++i) {
                 nodes[i] = malloc(sizeof(*nodes[i]));
-                assert(nodes[i]);
+                c_assert(nodes[i]);
                 nodes[i]->key = i;
                 c_rbnode_init(&nodes[i]->rb);
         }
@@ -190,7 +190,7 @@ static void test_posix(void) {
         ts = now();
         for (i = 0; i < sizeof(nodes) / sizeof(*nodes); ++i) {
                 slot = c_rbtree_find_slot(&t, compare, (void *)(unsigned long)nodes[i]->key, &p);
-                assert(slot);
+                c_assert(slot);
                 c_rbtree_add(&t, p, slot, &nodes[i]->rb);
         }
         ts_c1 = now() - ts;
@@ -210,10 +210,10 @@ static void test_posix(void) {
         for (p = c_rbtree_first(&t); p; p = c_rbnode_next(p)) {
                 ++i;
 
-                assert(v <= node_from_rb(p)->key);
+                c_assert(v <= node_from_rb(p)->key);
                 v = node_from_rb(p)->key;
         }
-        assert(i == sizeof(nodes) / sizeof(*nodes));
+        c_assert(i == sizeof(nodes) / sizeof(*nodes));
         ts_c2 = now() - ts;
 
         ts = now();
@@ -226,14 +226,14 @@ static void test_posix(void) {
         /* lookup all nodes (in different order) */
         ts = now();
         for (i = 0; i < sizeof(nodes) / sizeof(*nodes); ++i)
-                assert(nodes[i] == c_rbtree_find_entry(&t, compare,
+                c_assert(nodes[i] == c_rbtree_find_entry(&t, compare,
                                                        (void *)(unsigned long)nodes[i]->key,
                                                        Node, rb));
         ts_c3 = now() - ts;
 
         ts = now();
         for (i = 0; i < sizeof(nodes) / sizeof(*nodes); ++i)
-                assert(nodes[i] == posix_rbtree_find(&pt, nodes[i]->key));
+                c_assert(nodes[i] == posix_rbtree_find(&pt, nodes[i]->key));
         ts_p3 = now() - ts;
 
         /* shuffle nodes again */
diff --git a/subprojects/c-stdaux b/subprojects/c-stdaux
new file mode 160000
+Subproject 1bcec740f7ee1d2e71f84ac574f70fb4ec30539