diff --git a/src/OpenMesh/Tools/Decimater/ModEdgeLengthT.cc b/src/OpenMesh/Tools/Decimater/ModEdgeLengthT.cc
index ac589c601346f31108e95907c746e1f658b774fd..732b5fbeec6d8d78a1f0eea1b4f7be724d89975f 100644
--- a/src/OpenMesh/Tools/Decimater/ModEdgeLengthT.cc
+++ b/src/OpenMesh/Tools/Decimater/ModEdgeLengthT.cc
@@ -49,7 +49,7 @@
 //
 //=============================================================================
 
-#define MB_MODEDGELENGTHT_C
+#define MODEDGELENGTHT_C
 
 
 //== INCLUDES =================================================================
diff --git a/src/OpenMesh/Tools/Decimater/ModEdgeLengthT.hh b/src/OpenMesh/Tools/Decimater/ModEdgeLengthT.hh
index 5362ffc6b3851eed90b671cdc39af5cb55ad56b4..5c447bec63935635efb8c433c3782695bea41483 100644
--- a/src/OpenMesh/Tools/Decimater/ModEdgeLengthT.hh
+++ b/src/OpenMesh/Tools/Decimater/ModEdgeLengthT.hh
@@ -49,8 +49,8 @@
 //=============================================================================
 
 
-#ifndef MB_MODEDGELENGTHT_HH
-#define MB_MODEDGELENGTHT_HH
+#ifndef MODEDGELENGTHT_HH
+#define MODEDGELENGTHT_HH
 
 
 //== INCLUDES =================================================================
@@ -108,11 +108,11 @@ private:
 } // END_NS_DECIMATER
 } // END_NS_OPENMESH
 //=============================================================================
-#if defined(INCLUDE_TEMPLATES) && !defined(MB_MODEDGELENGTHT_C)
-#define MB_MODEDGELENGTHT_TEMPLATES
+#if defined(INCLUDE_TEMPLATES) && !defined(MODEDGELENGTHT_C)
+#define MODEDGELENGTHT_TEMPLATES
 #include "ModEdgeLengthT.cc"
 #endif
 //=============================================================================
-#endif // MB_MODEDGELENGTHT_HH defined
+#endif // MODEDGELENGTHT_HH defined
 //=============================================================================
 
diff --git a/src/OpenMesh/Tools/Decimater/ModHausdorffT.cc b/src/OpenMesh/Tools/Decimater/ModHausdorffT.cc
index 4aff88cb4922372575e0f3756313b03cbe00b176..5af79c781c8b17c4eff730d98fb423e637c0f160 100644
--- a/src/OpenMesh/Tools/Decimater/ModHausdorffT.cc
+++ b/src/OpenMesh/Tools/Decimater/ModHausdorffT.cc
@@ -49,7 +49,7 @@
 //
 //=============================================================================
 
-#define MB_MODHAUSDORFFT_C
+#define MODHAUSDORFFT_C
 
 
 //== INCLUDES =================================================================
diff --git a/src/OpenMesh/Tools/Decimater/ModHausdorffT.hh b/src/OpenMesh/Tools/Decimater/ModHausdorffT.hh
index 7ddeec909ea751bab54940cb75c1b49fe0e7d3ce..e85636c26dc1b9f8859a65e50e0d72208d9a349a 100644
--- a/src/OpenMesh/Tools/Decimater/ModHausdorffT.hh
+++ b/src/OpenMesh/Tools/Decimater/ModHausdorffT.hh
@@ -50,8 +50,8 @@
 //=============================================================================
 
 
-#ifndef MB_MODHAUSDORFFT_HH
-#define MB_MODHAUSDORFFT_HH
+#ifndef MODHAUSDORFFT_HH
+#define MODHAUSDORFFT_HH
 
 
 //== INCLUDES =================================================================
@@ -149,11 +149,11 @@ private:
 } // END_NS_DECIMATER
 } // END_NS_OPENMESH
 //=============================================================================
-#if defined(INCLUDE_TEMPLATES) && !defined(MB_MODHAUSDORFFT_C)
-#define MB_MODHAUSDORFFT_TEMPLATES
+#if defined(INCLUDE_TEMPLATES) && !defined(MODHAUSDORFFT_C)
+#define MODHAUSDORFFT_TEMPLATES
 #include "ModHausdorffT.cc"
 #endif
 //=============================================================================
-#endif // MB_MODHAUSDORFFT_HH defined
+#endif // MODHAUSDORFFT_HH defined
 //=============================================================================
 
diff --git a/src/OpenMesh/Tools/Decimater/ModNormalDeviationT.hh b/src/OpenMesh/Tools/Decimater/ModNormalDeviationT.hh
index 497ec52d908390078870e04355ae4d0c35d333ae..5ac6db2da394c8cbd3ae7817e016734b48fc3eba 100644
--- a/src/OpenMesh/Tools/Decimater/ModNormalDeviationT.hh
+++ b/src/OpenMesh/Tools/Decimater/ModNormalDeviationT.hh
@@ -49,8 +49,8 @@
 //=============================================================================
 
 
-#ifndef MB_MODNORMALDEVIATIONT_HH
-#define MB_MODNORMALDEVIATIONT_HH
+#ifndef MODNORMALDEVIATIONT_HH
+#define MODNORMALDEVIATIONT_HH
 
 
 //== INCLUDES =================================================================
@@ -208,6 +208,6 @@ private:
 } // END_NS_DECIMATER
 } // END_NS_OPENMESH
 //=============================================================================
-#endif // MB_MODNORMALDEVIATIONT_HH defined
+#endif // MODNORMALDEVIATIONT_HH defined
 //=============================================================================
 
diff --git a/src/OpenMesh/Tools/Decimater/calc-roundness.m b/src/OpenMesh/Tools/Decimater/calc-roundness.m
deleted file mode 100644
index 99192be18cd22efbaafef07bd4ddb3cc0960b446..0000000000000000000000000000000000000000
--- a/src/OpenMesh/Tools/Decimater/calc-roundness.m
+++ /dev/null
@@ -1,21 +0,0 @@
-# angle in degrees [0,60]
-# 
-# compute roundness of first case
-
-A = [ 0.0335717 0.0576863 -0.0503314 ]';
-B = [ 0.0325544 0.057614 -0.0504989 ]';
-C = [ 0.0323531 0.057051 -0.0504476 ]';
-
-#
-vecAC=C-A;
-vecAB=B-A;
-
-aa = norm(B-C)^2;
-bb = norm(vecAC)^2;
-cc = norm(vecAB)^2;
-AA = norm(cross(vecAC,vecAB))^2
-
-nom   = AA * min( aa, min(bb,cc) );
-denom = aa * bb * cc;
-nR1   = sqrt(4.0/3.0) * sqrt(nom/denom)
-
diff --git a/src/OpenMesh/Tools/Decimater/roundness.m b/src/OpenMesh/Tools/Decimater/roundness.m
deleted file mode 100644
index 3cd055887e4a9d932716ed96b8e92c9b99f1899f..0000000000000000000000000000000000000000
--- a/src/OpenMesh/Tools/Decimater/roundness.m
+++ /dev/null
@@ -1,46 +0,0 @@
-# angle in degrees [0,60]
-# [replace :angle: with a value between 0 and 60]
-alpha_d = :angle:;
-
-# compute roundness of first case
-
-alpha = pi * alpha_d/180;
-
-A = [ 0 0 0 ]';
-B = [ 2*cos(alpha) 0 0 ]';
-C = [ cos(alpha) sin(alpha) 0 ]';
-
-#
-vecAC=C-A;
-vecAB=B-A;
-
-aa = norm(B-C)^2;
-bb = norm(vecAC)^2;
-cc = norm(vecAB)^2;
-AA = norm(cross(vecAC,vecAB))^2;
-
-nom   = AA * min( aa, min(bb,cc) );
-denom = aa * bb * cc;
-nR1   = sqrt(4.0/3.0) * sqrt(nom/denom)
-
-# compute roundness of 2nd case
-
-alpha = pi * ((180-alpha_d)/2)/180;
-
-A = [ 0 0 0 ]';
-B = [ 2*cos(alpha) 0 0 ]';
-C = [ cos(alpha) sin(alpha) 0 ]';
-
-#
-vecAC=C-A;
-vecAB=B-A;
-
-aa = norm(B-C)^2;
-bb = norm(vecAC)^2;
-cc = norm(vecAB)^2;
-AA = norm(cross(vecAC,vecAB))^2;
-
-nom   = AA * min( aa, min(bb,cc) );
-denom = aa * bb * cc;
-nR2   = sqrt(4.0/3.0) * sqrt(nom/denom)
-
diff --git a/src/OpenMesh/Tools/Decimater/roundness.sh b/src/OpenMesh/Tools/Decimater/roundness.sh
deleted file mode 100644
index dd0d0a15582be2d3cdf20fd15939f4e0a343b096..0000000000000000000000000000000000000000
--- a/src/OpenMesh/Tools/Decimater/roundness.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-i=0
-while ((i <= 60)); do
-  cat roundness.m | perl -pe "s/:angle:/$i/" > tmp.m
-  echo $i `octave -q tmp.m 2> /dev/null | grep -v "nR2" | perl -pe 's/^nR1 = (.*)$/\1/'`
-  i=$((++i))
-done