Revert "Fix build errors"

This reverts commit 047e044145368191b1796c4bd8eaaf91f113db3a.
Revert "Little derp"

This reverts commit 1be99e72d93d68cee78a3a25b23ec33bb7c02634.
Revert "Reflactor settings headers"

This reverts commit 47f2ecf5239cc52c02ae2f57c33b1b3d02906bfc.
Fix TRDS on