Headers removed, guards added