Removing c++11 features from header files.  Moving state types to enum.  Moving const globals to defines.