diff --git a/mex/sources/bytecode/ErrorHandling.hh b/mex/sources/bytecode/ErrorHandling.hh
index 49e9b4a66..4ffb91ccd 100644
--- a/mex/sources/bytecode/ErrorHandling.hh
+++ b/mex/sources/bytecode/ErrorHandling.hh
@@ -29,7 +29,7 @@
 #include "CodeInterpreter.hh"
 
 #define _USE_MATH_DEFINES
-#include <math.h>
+#include <cmath>
 #ifndef M_PI
 # define M_PI (3.14159265358979323846)
 #endif
diff --git a/mex/sources/bytecode/Evaluate.cc b/mex/sources/bytecode/Evaluate.cc
index c9c5e39a8..31639b7bd 100644
--- a/mex/sources/bytecode/Evaluate.cc
+++ b/mex/sources/bytecode/Evaluate.cc
@@ -19,7 +19,7 @@
 
 #include <cstring>
 #include <sstream>
-#include <math.h>
+#include <cmath>
 #include "Evaluate.hh"
 
 #ifdef MATLAB_MEX_FILE
diff --git a/mex/sources/bytecode/bytecode.cc b/mex/sources/bytecode/bytecode.cc
index 31efcd311..f7f4221b9 100644
--- a/mex/sources/bytecode/bytecode.cc
+++ b/mex/sources/bytecode/bytecode.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2007-2020 Dynare Team
+ * Copyright © 2007-2021 Dynare Team
  *
  * This file is part of Dynare.
  *
@@ -20,7 +20,7 @@
 #include "Interpreter.hh"
 #include "ErrorHandling.hh"
 #include <ctime>
-#include <math.h>
+#include <cmath>
 
 #ifdef DEBUG_EX
 
@@ -55,7 +55,7 @@ Get_Argument(const mxArray *prhs)
 #endif
 
 //#include <windows.h>
-#include <stdio.h>
+#include <cstdio>
 
 #ifdef CUDA
 int
diff --git a/mex/sources/bytecode/testing/mex_interface.hh b/mex/sources/bytecode/testing/mex_interface.hh
index b8b0dbfb0..23354e0c9 100644
--- a/mex/sources/bytecode/testing/mex_interface.hh
+++ b/mex/sources/bytecode/testing/mex_interface.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2007-2020 Dynare Team
+ * Copyright © 2007-2021 Dynare Team
  *
  * This file is part of Dynare.
  *
@@ -23,7 +23,7 @@
 #include <iostream>
 #include <cstdio>
 #include <cstdlib>
-#include <stdarg.h>
+#include <cstdarg>
 #include <map>
 #include <vector>
 #include <algorithm>