Revert "try moving stuff away from include/"
that was a dumb idea i think, and rather pointless hopefully

This reverts commit 095da30cef54f467023a32497a94929e24880176.