Make the internal state really internal (i.e. no longer included in header files)