diff --git a/Code/Mantid/Framework/CurveFitting/src/DynamicKuboToyabe.cpp b/Code/Mantid/Framework/CurveFitting/src/DynamicKuboToyabe.cpp
index 32599d08835e317971c8fed6e908d28be03ac167..52a6cbc611acc881e1e8d5e26337fc7fa744dffa 100644
--- a/Code/Mantid/Framework/CurveFitting/src/DynamicKuboToyabe.cpp
+++ b/Code/Mantid/Framework/CurveFitting/src/DynamicKuboToyabe.cpp
@@ -6,10 +6,6 @@
 #include "MantidAPI/FunctionFactory.h"
 #include <vector>
 
-#define JMAX 14
-#define JMAXP (JMAX+1)
-#define K 5
-
 namespace Mantid
 {
 namespace CurveFitting
@@ -102,9 +98,14 @@ void polint (double xa[], double ya[], int n, double x, double& y, double& dy) {
 
 // Integration
 double integral (double func(const double, const double, const double),
-				const double a, const double b, const double g, const double w0) {
-	int j;
-	double ss,dss;
+                 const double a, const double b, const double g, const double w0) {
+
+  const int JMAX = 14;
+  const int JMAXP = JMAX + 1;
+  const int K = 5;
+
+  int j;
+  double ss,dss;
 	double h[JMAXP+1], s[JMAXP];
 
 	h[1] = 1.0;