fixed .cpp include lines to properly link to .h files