Added missing headers and class comments.