Added includes to new files