diff --git a/plugins_tools/eid-viewer/test/testlib.c b/plugins_tools/eid-viewer/test/testlib.c
index 91b381a8e..c17942292 100644
--- a/plugins_tools/eid-viewer/test/testlib.c
+++ b/plugins_tools/eid-viewer/test/testlib.c
@@ -23,8 +23,6 @@
 #pragma pack(push, cryptoki, 1)
 #include "pkcs11.h"
 #pragma pack(pop, cryptoki)
-#include <stdio.h>
-#include <stdint.h>
 #include <tchar.h>
 #else
 #include <unix.h>
@@ -38,6 +36,8 @@
 #include <stdarg.h>
 #include <stdbool.h>
 #include <errno.h>
+#include <stdio.h>
+#include <stdint.h>
 
 
 #include "serial_io.h"
diff --git a/tests/unit/testlib.c b/tests/unit/testlib.c
index 32c77a739..0c1b0fe2b 100644
--- a/tests/unit/testlib.c
+++ b/tests/unit/testlib.c
@@ -23,8 +23,6 @@
 #pragma pack(push, cryptoki, 1)
 #include "pkcs11.h"
 #pragma pack(pop, cryptoki)
-#include <stdio.h>
-#include <stdint.h>
 #include <tchar.h>
 #else
 #include <unix.h>
@@ -37,6 +35,8 @@
 #include <stdarg.h>
 #include <stdbool.h>
 #include <errno.h>
+#include <stdio.h>
+#include <stdint.h>
 
 #include "testlib.h"