diff --git a/include/ITANumericUtils.h b/include/ITANumericUtils.h
index 1f7ae2eae685fc837f6f2fed1d8f5c94a592e49a..f527f4a7d27a2549205663a015e8f9a08adafa9b 100644
--- a/include/ITANumericUtils.h
+++ b/include/ITANumericUtils.h
@@ -45,6 +45,7 @@ ITA_BASE_API bool isPow2( unsigned int x );
 ITA_BASE_API unsigned int nextPow2( unsigned int x );
 
 // Rundung auf Compilern definieren die dies nicht standardmäßig mitliefern
+// not so nice!! consider namespacing this very typical function names
 
 #ifndef HAVE_ROUND
 ITA_BASE_API inline double round( double x )
diff --git a/src/ITAHDFTSpectrum.cpp b/src/ITAHDFTSpectrum.cpp
index b7fdfd836baf5aca9f0c595cc2917ab4f8a8e399..08c765e2e39e2a7911d50743322f467f303248c8 100644
--- a/src/ITAHDFTSpectrum.cpp
+++ b/src/ITAHDFTSpectrum.cpp
@@ -1,14 +1,15 @@
 #include <ITAHDFTSpectrum.h>
 
 #include <ITAFastMath.h>
-#include <stdio.h>
 #include <ITAException.h>
 #include <ITAStringUtils.h>
-#include <cmath>
-#include <complex>
-#include <math.h>
 #include <ITANumericUtils.h>
-#include "ITASampleBuffer.h"
+#include <ITASampleBuffer.h>
+
+#include <cmath>
+#include <cmath>
+#include <stdio.h>
+
 
 ITAHDFTSpectrum::ITAHDFTSpectrum()
 	: m_iSize( 0 )
diff --git a/src/ITAInterpolation.cpp b/src/ITAInterpolation.cpp
index 155b7d10c566390c7bd7e3ec1ad21f5e0599142f..15f9a93081ea1aae3387a78e4d1bde9f0f383675 100644
--- a/src/ITAInterpolation.cpp
+++ b/src/ITAInterpolation.cpp
@@ -2,8 +2,10 @@
 
 #include <ITAConstants.h>
 #include <ITASampleBuffer.h>
+#include <ITANumericUtils.h>
 
 #include <cassert>
+
 // Calculate cubic spline set (second derivatives, ypp) for equidistant data
 void spline_cubic_set_equidistant( const int n, const float* y, float* ypp );
 
@@ -98,7 +100,7 @@ bool CITASampleLinearInterpolation::Interpolate( const ITASampleBuffer* pInput,
 
 			if( i == iOutputLength - 1 )
 			{
-				assert( x_input == ( float ) iInputLength - iInputStartOffset );
+				assert( std::lroundf( x_input ) == iInputLength - iInputStartOffset );
 			}
 
 			// Linkes/rechtes Nachbarsample in der Eingabe