diff --git a/makefiles/posix/toolchain_native.mk b/makefiles/posix/toolchain_native.mk
index 8b07a35f88..eeba6d8f91 100644
--- a/makefiles/posix/toolchain_native.mk
+++ b/makefiles/posix/toolchain_native.mk
@@ -156,7 +156,7 @@ ARCHOPTIMIZATION	 = $(MAXOPTIMIZATION) \
 # Language-specific flags
 #
 ARCHCFLAGS		 = -std=gnu99 -g
-ARCHCXXFLAGS		 = -fno-exceptions -fno-rtti -std=c++0x -fno-threadsafe-statics -D__CUSTOM_FILE_IO__ -g
+ARCHCXXFLAGS		 = -fno-exceptions -fno-rtti -std=c++11 -fno-threadsafe-statics -D__CUSTOM_FILE_IO__ -g
 
 # Generic warnings
 #
diff --git a/src/lib/px4_eigen.h b/src/lib/px4_eigen.h
index 2cd98e59aa..6c4556c5f5 100644
--- a/src/lib/px4_eigen.h
+++ b/src/lib/px4_eigen.h
@@ -46,6 +46,8 @@
 #pragma GCC diagnostic ignored "-Wfloat-equal"
 #define _GLIBCXX_USE_C99_FP_MACROS_DYNAMIC 1
 
+#define EIGEN_MAX_STATIC_ALIGN_BYTES 16
+
 #include <eigen/Eigen/Core>
 #include <eigen/Eigen/Geometry>
 #pragma GCC diagnostic pop
diff --git a/src/systemcmds/tests/test_eigen.cpp b/src/systemcmds/tests/test_eigen.cpp
index 87035059aa..6be961e644 100644
--- a/src/systemcmds/tests/test_eigen.cpp
+++ b/src/systemcmds/tests/test_eigen.cpp
@@ -38,6 +38,7 @@
  * @author Johan Jansen <jnsn.johan@gmail.com>
  */
 
+#include <cmath>
 #include <px4_eigen.h>
 #include <float.h>
 #include <stdio.h>