Cleaned up headers so they use std:: instead of having a namespace