Added public scope to some header files.