Actually start using includes
Adding some files I forgot to include previously.