added ifndef's to the beginning of files to clean up includes.