some cleanup.
merged all renderer headers.