diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog
index f406468cee..7812e9545d 100644
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-07  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+	* math_parser.C (parse1): change to use lyx::support::atoi
+	* math_sizeinset.C (MathSizeInset): ditto
 
 2004-08-12  André Pönitz  <poenitz@gmx.net>
 
diff --git a/src/mathed/math_parser.C b/src/mathed/math_parser.C
index 784cc4207a..f16092f441 100644
--- a/src/mathed/math_parser.C
+++ b/src/mathed/math_parser.C
@@ -62,12 +62,12 @@ following hack as starting point to write some macros:
 
 #include "lyxlex.h"
 #include "debug.h"
+#include "support/lyxlib.h"
 
 #include <sstream>
 
-#ifndef CXX_GLOBAL_CSTD
-using std::atoi;
-#endif
+using lyx::support::atoi;
+
 using std::endl;
 using std::fill;
 
@@ -797,7 +797,7 @@ void Parser::parse1(MathGridInset & grid, unsigned flags,
 
 				string arg  = getArg('[', ']');
 				if (!arg.empty())
-					nargs = atoi(arg.c_str());
+					nargs = atoi(arg);
 
 			}
 
diff --git a/src/mathed/math_sizeinset.C b/src/mathed/math_sizeinset.C
index b6e3a81769..49966d2292 100644
--- a/src/mathed/math_sizeinset.C
+++ b/src/mathed/math_sizeinset.C
@@ -15,17 +15,17 @@
 #include "math_mathmlstream.h"
 #include "math_parser.h"
 #include "math_streamstr.h"
-#include "support/std_ostream.h"
 
-#ifndef CXX_GLOBAL_CSTD
-using std::atoi;
-#endif
+#include "support/std_ostream.h"
+#include "support/lyxlib.h"
+
+using lyx::support::atoi;
 
 using std::auto_ptr;
 
 
 MathSizeInset::MathSizeInset(latexkeys const * l)
-	: MathNestInset(1), key_(l), style_(Styles(atoi(l->extra.c_str())))
+	: MathNestInset(1), key_(l), style_(Styles(atoi(l->extra)))
 {}