[BUGFIX] Make auto-inclusion of static TS work and enforce it