diff --git a/meson.build b/meson.build
index 6e8364b5..5620979f 100644
--- a/meson.build
+++ b/meson.build
@@ -295,8 +295,9 @@ dm1801_def = def + mk22fn512_def + {'PLATFORM_DM1801': ''}
 ## -------------------------- Compilation arguments ----------------------------
 ##
 
-linux_c_args = []
-linux_l_args = ['-lm']
+linux_c_args   = ['-DPLATFORM_LINUX']
+linux_cpp_args = ['-std=c++14', '-DPLATFORM_LINUX']
+linux_l_args   = ['-lm']
 
 # Add AddressSanitizer if required
 if get_option('asan')
@@ -364,6 +365,7 @@ endforeach
 
 linux_opts = {'sources': linux_src,
               'c_args': linux_c_args,
+              'cpp_args' : linux_cpp_args,
               'include_directories': linux_inc,
               'dependencies': linux_dep,
               'link_args' : linux_l_args}
diff --git a/openrtx/include/protocols/M17/M17Utils.h b/openrtx/include/protocols/M17/M17Utils.h
index 424a6ab3..8fa24024 100644
--- a/openrtx/include/protocols/M17/M17Utils.h
+++ b/openrtx/include/protocols/M17/M17Utils.h
@@ -26,6 +26,8 @@
 #error This header is C++ only!
 #endif
 
+#include <cstddef>
+#include <cstdint>
 #include <array>
 
 
diff --git a/platform/targets/linux/hwconfig.h b/platform/targets/linux/hwconfig.h
index e534589e..1ebc2fa3 100644
--- a/platform/targets/linux/hwconfig.h
+++ b/platform/targets/linux/hwconfig.h
@@ -15,9 +15,6 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-
-#define PLATFORM_LINUX
-
 /* Device has a working real time clock */
 #define HAS_RTC