updated includes to match new filenames and extended auto-login wait to 5s