Index: branches/presentation/src/lib/graphics/importer/primitive_model.cc
===================================================================
--- branches/presentation/src/lib/graphics/importer/primitive_model.cc	(revision 9091)
+++ branches/presentation/src/lib/graphics/importer/primitive_model.cc	(revision 9092)
@@ -18,5 +18,4 @@
 #include "primitive_model.h"
 
-#include <math.h>
 #include "vector.h"
 #include "debug.h"
Index: branches/presentation/src/lib/graphics/spatial_separation/quadtree.cc
===================================================================
--- branches/presentation/src/lib/graphics/spatial_separation/quadtree.cc	(revision 9091)
+++ branches/presentation/src/lib/graphics/spatial_separation/quadtree.cc	(revision 9092)
@@ -52,7 +52,7 @@
 
   /* make an array with access to the leafs of the Quad-Tree */
-  this->nodes = new QuadtreeNode*[(int)pow(4, treeDepth)];
+  this->nodes = new QuadtreeNode*[(int)pow(4.0, treeDepth)];
   int index = 0; //new int; *index = 0; // !!changed by bensch!!
-  for(int i = 0; i < (int)pow(2, treeDepth); ++i)
+  for(int i = 0; i < (int)pow(2.0, treeDepth); ++i)
   {
     this->rootNode->buildHashTable(this->nodes, &index);
@@ -70,5 +70,5 @@
   this->offset->x = xOff;
   this->offset->z = yOff;
-  this->maxIndex = (int)pow(2, this->treeDepth);
+  this->maxIndex = (int)pow(2.0, this->treeDepth);
 }
 
@@ -103,5 +103,5 @@
 void Quadtree::revertHashTable(QuadtreeNode** nodes)
 {
-  int                  len         = (int)pow(2, this->treeDepth);          //!< the length of a quadtree side
+  int                  len         = (int)pow(2.0, this->treeDepth);          //!< the length of a quadtree side
   int                  iterator    = 0;                                     //!< iterator used for mapping
   QuadtreeNode*        tmpNode     = NULL;                                  //!< temp saving place
@@ -132,5 +132,5 @@
 void Quadtree::sortHashTable(QuadtreeNode** nodes)
 {
-  int                  len         = (int)pow(2, this->treeDepth);          //!< the length of a quadtree side
+  int                  len         = (int)pow(2.0, this->treeDepth);          //!< the length of a quadtree side
   float                a;                                                   //!< temp place for float a
   float                b;                                                   //!< temp place for float b
@@ -207,5 +207,5 @@
 {
   //this->rootNode->drawTree();
-  for(int i = 0; i < (int)pow(4, this->treeDepth); ++i)
+  for(int i = 0; i < (int)pow(4.0, this->treeDepth); ++i)
   {
     this->nodes[i]->draw();
Index: branches/presentation/src/lib/graphics/spatial_separation/quadtree_node.cc
===================================================================
--- branches/presentation/src/lib/graphics/spatial_separation/quadtree_node.cc	(revision 9091)
+++ branches/presentation/src/lib/graphics/spatial_separation/quadtree_node.cc	(revision 9092)
@@ -164,5 +164,5 @@
 
   /*              offset              #of elements in a row            #of rows in a quadtree          */
-  int threshold = this->nodeIter + (int)pow(2, this->maxDepth) * (int)pow(2, maxDepth - treeDepth - 1);
+  int threshold = this->nodeIter + (int)pow(2.0, this->maxDepth) * (int)pow(2.0, maxDepth - treeDepth - 1);
   int loopLimit = (*index < threshold)?2:4;
 
Index: branches/presentation/src/lib/gui/gtk/gui_gtk.cc
===================================================================
--- branches/presentation/src/lib/gui/gtk/gui_gtk.cc	(revision 9091)
+++ branches/presentation/src/lib/gui/gtk/gui_gtk.cc	(revision 9092)
@@ -30,5 +30,5 @@
 #include <string.h>
 #include <stdlib.h>
-#include <math.h>
+#include <cmath>
 
 using namespace std;
Index: branches/presentation/src/lib/math/curve.cc
===================================================================
--- branches/presentation/src/lib/math/curve.cc	(revision 9091)
+++ branches/presentation/src/lib/math/curve.cc	(revision 9092)
@@ -29,5 +29,5 @@
 #include "debug.h"
 
-#include <math.h>
+#include <cmath>
 #include <stdio.h>
 
Index: branches/presentation/src/lib/math/line.h
===================================================================
--- branches/presentation/src/lib/math/line.h	(revision 9091)
+++ branches/presentation/src/lib/math/line.h	(revision 9092)
@@ -24,5 +24,4 @@
 #define __LINE_H_
 
-#include <math.h>
 #include "compiler.h"
 #include "vector.h"
Index: branches/presentation/src/lib/math/matrix.cc
===================================================================
--- branches/presentation/src/lib/math/matrix.cc	(revision 9091)
+++ branches/presentation/src/lib/math/matrix.cc	(revision 9092)
@@ -14,5 +14,5 @@
 */
 #include "matrix.h"
-#include <math.h>
+#include <cmath>
 
 #ifdef DEBUG
Index: branches/presentation/src/lib/math/matrix.h
===================================================================
--- branches/presentation/src/lib/math/matrix.h	(revision 9091)
+++ branches/presentation/src/lib/math/matrix.h	(revision 9092)
@@ -4,5 +4,4 @@
  */
 
-#include <math.h>
 #include "vector.h"
 
Index: branches/presentation/src/lib/math/plane.h
===================================================================
--- branches/presentation/src/lib/math/plane.h	(revision 9091)
+++ branches/presentation/src/lib/math/plane.h	(revision 9092)
@@ -24,5 +24,4 @@
 #define __PLANE_H_
 
-#include <math.h>
 #include "compiler.h"
 #include "vector.h"
Index: branches/presentation/src/lib/math/quaternion.h
===================================================================
--- branches/presentation/src/lib/math/quaternion.h	(revision 9091)
+++ branches/presentation/src/lib/math/quaternion.h	(revision 9092)
@@ -24,5 +24,4 @@
 #define __QUATERNION_H_
 
-#include <math.h>
 #include "compiler.h"
 //! PI the circle-constant
Index: branches/presentation/src/lib/math/vector.cc
===================================================================
--- branches/presentation/src/lib/math/vector.cc	(revision 9091)
+++ branches/presentation/src/lib/math/vector.cc	(revision 9092)
@@ -29,5 +29,4 @@
 #endif
 
-using namespace std;
 
 /////////////
Index: branches/presentation/src/lib/math/vector.h
===================================================================
--- branches/presentation/src/lib/math/vector.h	(revision 9091)
+++ branches/presentation/src/lib/math/vector.h	(revision 9092)
@@ -24,5 +24,5 @@
 #define __VECTOR_H_
 
-#include <math.h>
+#include <cmath>
 #include "compiler.h"
 //! PI the circle-constant
@@ -89,5 +89,5 @@
   void scale(const Vector& v) {   x *= v.x;  y *= v.y; z *= v.z; };
   /** @returns the length of the vector */
-  inline float len() const { return sqrt (x*x+y*y+z*z); }
+  inline float len() const { return sqrt (x*x + y*y + z*z); }
   /** normalizes the vector */
   inline void normalize() { float l = len(); if( unlikely(l == 0.0))return; this->x=this->x/l; this->y=this->y/l; this->z=this->z/l; };
