Cleaned up includes in implementation files
Merge remote-tracking branch 'galdor557/master'