Fixed exported headers