Updated include guards naming
Added gamelib.h to header includes; re-arranged dep order
Update comments