Hello! I can confirm that we are doing a lot of work to fix up the includes for a future release. It’s a big undertaking, but when we’re done it should be a fraction of the amount of text on any given list of includes. Once we have something more solid to say on the update, we’ll share more info.