#include <config.h>
#include "math_xarrowinset.h"
-#include "math_support.h"
-#include "math_parser.h"
+#include "math_data.h"
#include "math_mathmlstream.h"
#include "math_streamstr.h"
+#include "math_support.h"
+
+using std::string;
using std::auto_ptr;