#include <config.h>
#include "math_sizeinset.h"
-#include "math_parser.h"
+#include "math_data.h"
#include "math_mathmlstream.h"
+#include "math_parser.h"
#include "math_streamstr.h"
-#include "math_support.h"
-#include "support/LOstream.h"
+#include "support/std_ostream.h"
+#ifndef CXX_GLOBAL_CSTD
using std::atoi;
+#endif
+
using std::auto_ptr;