diff --git a/radio/Equalizer.hpp b/radio/Equalizer.hpp
index e3f8400..2c84ed2 100644
--- a/radio/Equalizer.hpp
+++ b/radio/Equalizer.hpp
@@ -5,8 +5,8 @@
  * Created on 20. Dezember 2014, 09:24
  */
 
-#ifndef EQUALIZER_HPP
-#define	EQUALIZER_HPP
+#ifndef _RADIO_EQUALIZER_HPP_
+#define	_RADIO_EQUALIZER_HPP_
 
 #include "Vector.hpp"
 #include "FirComplex.hpp"
@@ -198,5 +198,5 @@ private:
 } // ::Radio
 
 
-#endif	/* EQUALIZER_HPP */
+#endif	/* _RADIO_EQUALIZER_HPP_ */
 
diff --git a/radio/FirComplex.hpp b/radio/FirComplex.hpp
index c2f0c83..c077dc0 100644
--- a/radio/FirComplex.hpp
+++ b/radio/FirComplex.hpp
@@ -5,8 +5,8 @@
  * Created on 20. Dezember 2014, 08:12
  */
 
-#ifndef FIRCOMPLEX_HPP
-#define	FIRCOMPLEX_HPP
+#ifndef _RADIO_FIRCOMPLEX_HPP_
+#define	_RADIO_FIRCOMPLEX_HPP_
 
 #include "Vector.hpp"
 
@@ -66,5 +66,5 @@ protected:
 
 } // ::Radio
 
-#endif	/* FIRCOMPLEX_HPP */
+#endif	/* _RADIO_FIRCOMPLEX_HPP_ */
 
diff --git a/radio/Frame.cpp b/radio/Frame.cpp
index 8a96630..7b612c3 100644
--- a/radio/Frame.cpp
+++ b/radio/Frame.cpp
@@ -1,6 +1,7 @@
 // --------------------------------------------------------------
 #include <string.h>
 #include <math.h>
+#include <stdint.h>
 #include <crc/crc.h>
 #include <radio/symbol.h>
 #include "Frame.hpp"
diff --git a/radio/Frame.hpp b/radio/Frame.hpp
index 866cdfa..55a6b92 100644
--- a/radio/Frame.hpp
+++ b/radio/Frame.hpp
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------
-#ifndef _FRAME_HPP_
-#define	_FRAME_HPP_
+#ifndef _RADIO_FRAME_HPP_
+#define	_RADIO_FRAME_HPP_
 
 #include <radio/radio_types.h>
 #include <radio/cpx.h>
@@ -304,4 +304,4 @@ private:
 };
 
 // --------------------------------------------------------------
-#endif // _FRAME_HPP_
+#endif // _RADIO_FRAME_HPP_
diff --git a/radio/Interpolation.hpp b/radio/Interpolation.hpp
index 4e7dfed..f241f9d 100644
--- a/radio/Interpolation.hpp
+++ b/radio/Interpolation.hpp
@@ -5,8 +5,8 @@
  * Created on 20. Dezember 2014, 19:02
  */
 
-#ifndef INTERPOLATION_HPP
-#define	INTERPOLATION_HPP
+#ifndef _RADIO_INTERPOLATION_HPP_
+#define	_RADIO_INTERPOLATION_HPP_
 
 #include <cstdio>
 #include "Vector.hpp"
@@ -92,13 +92,13 @@ public:
 			}
 		}
 
-		Eigen::internal::set_is_malloc_allowed(true);
+//		Eigen::internal::set_is_malloc_allowed(true);
 		// Partial filter responses
 		for (i=0; i < m_M; i++)
 		{
 			m_h[i] = FirComplex::processReal(m_coeff.col(i));
 		}
-		Eigen::internal::set_is_malloc_allowed(false);
+//		Eigen::internal::set_is_malloc_allowed(false);
 
 		// Combine
 		return horner(mu);
@@ -437,5 +437,5 @@ private:
 } // Radio::Interpolation
 } // ::Radio
 
-#endif	/* INTERPOLATION_HPP */
+#endif	/* _RADIO_INTERPOLATION_HPP_ */
 
diff --git a/radio/Nco.hpp b/radio/Nco.hpp
index 03eeb79..e620e34 100644
--- a/radio/Nco.hpp
+++ b/radio/Nco.hpp
@@ -5,10 +5,10 @@
  * Created on 22. Dezember 2014, 12:51
  */
 
-#ifndef NCO_HPP
-#define	NCO_HPP
+#ifndef _RADIO_NCO_HPP_
+#define	_RADIO_NCO_HPP_
 
-#include "radio/Vector.hpp"
+#include "Vector.hpp"
 
 namespace Radio
 {
@@ -140,5 +140,5 @@ private:
 } // ::Radio
 
 
-#endif	/* NCO_HPP */
+#endif	/* _RADIO_NCO_HPP_ */
 
diff --git a/radio/Vector.hpp b/radio/Vector.hpp
index 59edb51..1b0d08c 100644
--- a/radio/Vector.hpp
+++ b/radio/Vector.hpp
@@ -5,8 +5,8 @@
  * Created on 19. Dezember 2014, 18:24
  */
 
-#ifndef VECTOR_HPP
-#define	VECTOR_HPP
+#ifndef _RADIO_VECTOR_HPP_
+#define	_RADIO_VECTOR_HPP_
 
 #include <Eigen/Dense>
 using namespace Eigen;
@@ -14,7 +14,7 @@ using namespace Eigen;
 #include <complex>
 using namespace std;
 
-#include "../radio/radio_types.h"
+#include <radio/radio_types.h>
 
 using Eigen::Dense;
 
@@ -63,5 +63,5 @@ static void toCpxVector(cpx_t *pDst, CVec const &src, uint32_t len)
 
 } // ::Radio
 
-#endif	/* VECTOR_HPP */
+#endif	/* _RADIO_VECTOR_HPP_ */