diff --git a/include/agent/linux/get_distro.h b/include/agent/linux/get_distro.h
index 9abcb256535ccca99c5323a66754565b5f4921ea..ae5556a308e2ecf37fe6e97dc026228da6bdf3a5 100644
--- a/include/agent/linux/get_distro.h
+++ b/include/agent/linux/get_distro.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <sys/utsname.h>
 #include <fstream>
-#include <string>
+#include <cstring>
 
 int open_file(std::string name, std::ifstream& fstream);
 std::string get_distro();
diff --git a/include/agent/linux/get_macaddr.h b/include/agent/linux/get_macaddr.h
index 36144c1117248cc45f682b0361d4d0c047cff012..fe29987e7f1663ea00b144efad71b2060969866e 100644
--- a/include/agent/linux/get_macaddr.h
+++ b/include/agent/linux/get_macaddr.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <fstream>
 #include <iostream>
-#include <string>
+#include <cstring>
 
 std::string get_macaddr();
diff --git a/include/agent/linux/get_machine_type.h b/include/agent/linux/get_machine_type.h
index fdd2b4ee01c213094fb029a67ce126da41afef47..a787fa043b488fd500fa4fb1054ea0ec2464dc0c 100644
--- a/include/agent/linux/get_machine_type.h
+++ b/include/agent/linux/get_machine_type.h
@@ -3,11 +3,10 @@
 #include <netdb.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <cstring>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <unistd.h>
 #include <iostream>
-#include <string>
 
 std::string get_machine_type();
diff --git a/include/agent/linux/get_user_count.h b/include/agent/linux/get_user_count.h
index 4b386c13435dc56d83a39e9534167709aa1d391a..f80d58e39ac57645e344c4c2370c222d4618b7d3 100644
--- a/include/agent/linux/get_user_count.h
+++ b/include/agent/linux/get_user_count.h
@@ -9,7 +9,7 @@
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <cstring>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/fcntl.h>
diff --git a/include/agent/linux/inventory.h b/include/agent/linux/inventory.h
index 069f12c1c4485324f6e0a63252fde08b61c4d179..3d96c0cfd1db85ccc955d72430d8fbba73648015 100644
--- a/include/agent/linux/inventory.h
+++ b/include/agent/linux/inventory.h
@@ -1,5 +1,4 @@
 #pragma once
-#include <string.h>
 #include <sys/utsname.h>
 #include <time.h>
 #include <iostream>
diff --git a/src/linux/get_date.cpp b/src/linux/get_date.cpp
index bf44044d96d62d33eef8b59fa28766552a7594d9..ac47db77ae1adcf6a8cd40a67b2d032c34d25d3a 100644
--- a/src/linux/get_date.cpp
+++ b/src/linux/get_date.cpp
@@ -20,7 +20,6 @@
  */
 
 #include <agent/linux/get_date.h>
-#include <string>
 
 std::string get_date() {
     std::string res = "";
diff --git a/src/linux/get_distro.cpp b/src/linux/get_distro.cpp
index d837d8faf97465e1513193b931cc91452df306f6..88a4fc8e4d519ec7df8887e2967ff4c087296c6b 100644
--- a/src/linux/get_distro.cpp
+++ b/src/linux/get_distro.cpp
@@ -20,7 +20,6 @@
  */
 
 #include "agent/linux/get_distro.h"
-#include <string>
 
 int open_file(std::string name, std::ifstream& fstream) {
         fstream.open(name);
diff --git a/src/linux/get_macaddr.cpp b/src/linux/get_macaddr.cpp
index d6335bafa4289fdb7d7ed8d1f54835fff2e8fec1..63c2589341c0fcf5e3a31bd130c952f4d2b1a6d5 100644
--- a/src/linux/get_macaddr.cpp
+++ b/src/linux/get_macaddr.cpp
@@ -20,7 +20,6 @@
  */
 
 #include <agent/linux/get_macaddr.h>
-#include <string>
 
 std::string get_macaddr() {
     std::fstream file;
diff --git a/src/linux/get_machine_type.cpp b/src/linux/get_machine_type.cpp
index 374c054880c39ca2d6a3b7e8461d45ad903398f1..7141a3a626f7e62f3f4c3c11c9c0989fa2bc473a 100644
--- a/src/linux/get_machine_type.cpp
+++ b/src/linux/get_machine_type.cpp
@@ -20,7 +20,6 @@
  */
 
 #include <agent/linux/get_machine_type.h>
-#include <string>
 
 std::string get_machine_type() {
     struct addrinfo hints, *info, *p;
diff --git a/src/linux/get_time.cpp b/src/linux/get_time.cpp
index f70b0cf37b7bc14a2415eb601dd2ea5e3b1e2dab..24caafe930f8ed0e176a3c3677e248b51b76464e 100644
--- a/src/linux/get_time.cpp
+++ b/src/linux/get_time.cpp
@@ -20,7 +20,6 @@
  */
 
 #include "agent/linux/get_time.h"
-#include <string>
 
 // get current time
 std::string get_time() {
diff --git a/src/linux/get_user_count.cpp b/src/linux/get_user_count.cpp
index 80c0552a2fec0649c8d87e8535dd12a0411bebe2..b3e95ccf35e5f2f778fcd1265d3eb39608b79913 100644
--- a/src/linux/get_user_count.cpp
+++ b/src/linux/get_user_count.cpp
@@ -31,7 +31,6 @@
  */
 
 #include "agent/linux/get_user_count.h"
-#include <string>
  #include <set>
 
 /* Global variables */
diff --git a/src/linux/inventory.cpp b/src/linux/inventory.cpp
index db201162bceed8508c97de05e4c70ffa3e166b18..648f96cc8d8cbb3169ba2e310bae7c8c84f3d04d 100644
--- a/src/linux/inventory.cpp
+++ b/src/linux/inventory.cpp
@@ -20,7 +20,6 @@
  */
 
 #include "agent/linux/inventory.h"
-#include <string>
 
 std::string get_processor_model() {
     return "unknown";