diff --git a/include/vm_websocket.hpp b/include/vm_websocket.hpp
index d1127a4..7b07458 100644
--- a/include/vm_websocket.hpp
+++ b/include/vm_websocket.hpp
@@ -1,11 +1,11 @@
 #pragma once
 
 #include <app.h>
-#include <signal.h>
 #include <websocket.h>
 
 #include <boost/beast/core/flat_static_buffer.hpp>
 #include <boost/process.hpp>
+#include <csignal>
 #include <webserver_common.hpp>
 
 namespace crow
diff --git a/redfish-core/lib/sensors.hpp b/redfish-core/lib/sensors.hpp
index a03c13c..fb3b25e 100644
--- a/redfish-core/lib/sensors.hpp
+++ b/redfish-core/lib/sensors.hpp
@@ -17,12 +17,11 @@
 
 #include "node.hpp"
 
-#include <math.h>
-
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/container/flat_map.hpp>
 #include <boost/range/algorithm/replace_copy_if.hpp>
+#include <cmath>
 #include <dbus_singleton.hpp>
 #include <utils/json_utils.hpp>
 #include <variant>