Fixed some missing headers and notification center