9 files changed, 35 insertions, 25 deletions
diff --git a/test/array_test.cpp b/test/array_test.cpp
index ea9eb13..a1a4132 100644
--- a/test/array_test.cpp
+++ b/test/array_test.cpp
@@ -14,10 +14,10 @@
   along with Raul.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <stdio.h>
-
 #include "raul/Array.hpp"
 
+#include <cstdio>
+
 int
 main(int argc, char** argv)
 {
diff --git a/test/maid_test.cpp b/test/maid_test.cpp
index e21ba04..a692c1d 100644
--- a/test/maid_test.cpp
+++ b/test/maid_test.cpp
@@ -16,13 +16,16 @@
 
 #undef NDEBUG
 
+#include "raul/Maid.hpp"
+
+#include <atomic>
 #include <cassert>
+#include <chrono>
 #include <cstdio>
+#include <memory>
 #include <thread>
 #include <vector>
 
-#include "raul/Maid.hpp"
-
 using Raul::Maid;
 
 static const size_t n_threads         = 8;
diff --git a/test/path_test.cpp b/test/path_test.cpp
index 01f55c0..3b7b61b 100644
--- a/test/path_test.cpp
+++ b/test/path_test.cpp
@@ -14,10 +14,12 @@
   along with Raul.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "raul/Path.hpp"
+#include "raul/Symbol.hpp"
+
 #include <cstring>
 #include <iostream>
-
-#include "raul/Path.hpp"
+#include <string>
 
 using namespace std;
 using namespace Raul;
diff --git a/test/ringbuffer_test.cpp b/test/ringbuffer_test.cpp
index 7fc4042..1c488be 100644
--- a/test/ringbuffer_test.cpp
+++ b/test/ringbuffer_test.cpp
@@ -14,16 +14,16 @@
   along with Raul.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "raul/RingBuffer.hpp"
+
 #include <climits>
+#include <cstdint>
 #include <cstdio>
-#include <cstdlib>
 #include <cstring>
-#include <iostream>
+#include <memory>
 #include <string>
 #include <thread>
 
-#include "raul/RingBuffer.hpp"
-
 using namespace std;
 using namespace Raul;
 
diff --git a/test/sem_test.cpp b/test/sem_test.cpp
index f44fc5e..8daf82b 100644
--- a/test/sem_test.cpp
+++ b/test/sem_test.cpp
@@ -16,14 +16,12 @@
 
 #undef NDEBUG
 
+#include "raul/Semaphore.hpp"
+
 #include <cassert>
 #include <chrono>
-#include <iostream>
-#include <limits>
 #include <thread>
 
-#include "raul/Semaphore.hpp"
-
 static void
 wait_for_sem(Raul::Semaphore* sem)
 {
diff --git a/test/socket_test.cpp b/test/socket_test.cpp
index 8dd4aff..2472c21 100644
--- a/test/socket_test.cpp
+++ b/test/socket_test.cpp
@@ -14,19 +14,24 @@
   along with Raul.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <stdio.h>
-#include <sys/types.h>
+#include "raul/Socket.hpp"
+
+#include <poll.h>
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include "raul/Socket.hpp"
-
-using namespace std;
-using namespace Raul;
+#include <cerrno>
+#include <cstdio>
+#include <cstring>
+#include <memory>
+#include <string>
+#include <utility>
 
 int
 main(int argc, char** argv)
 {
+	using Socket = Raul::Socket;
+
 	std::string unix_uri("unix:///tmp/raul_test_sock");
 	std::string tcp_uri("tcp://127.0.0.1:12345");
 
diff --git a/test/symbol_test.cpp b/test/symbol_test.cpp
index 5164998..edc8879 100644
--- a/test/symbol_test.cpp
+++ b/test/symbol_test.cpp
@@ -14,11 +14,11 @@
   along with Raul.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <cstring>
+#include "raul/Symbol.hpp"
+
 #include <iostream>
 #include <list>
-
-#include "raul/Path.hpp"
+#include <string>
 
 using namespace std;
 using namespace Raul;
diff --git a/test/thread_test.cpp b/test/thread_test.cpp
index 9012b4c..78c0ad2 100644
--- a/test/thread_test.cpp
+++ b/test/thread_test.cpp
@@ -14,12 +14,12 @@
   along with Raul.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "raul/Semaphore.hpp"
+
 #include <atomic>
 #include <iostream>
 #include <thread>
 
-#include "raul/Semaphore.hpp"
-
 using namespace std;
 using namespace Raul;
 
diff --git a/test/time_test.cpp b/test/time_test.cpp
index 69416cd..c6f3d77 100644
--- a/test/time_test.cpp
+++ b/test/time_test.cpp
@@ -16,6 +16,8 @@
 
 #include "raul/TimeStamp.hpp"
 #include "raul/TimeSlice.hpp"
+
+#include <cstdint>
 #include <iostream>
 
 using namespace std;