diff --git a/subprojects/ncsid/test/iface_test.cpp b/subprojects/ncsid/test/iface_test.cpp
index 267194c..2ae340a 100644
--- a/subprojects/ncsid/test/iface_test.cpp
+++ b/subprojects/ncsid/test/iface_test.cpp
@@ -14,6 +14,9 @@
 
 #include "net_iface_mock.h"
 
+#include <memory>
+
+#include "gtest/gtest.h"
 #include <gtest/gtest.h>
 
 TEST(TestIFace, TestGetIndex)
diff --git a/subprojects/ncsid/test/net_iface_mock.cpp b/subprojects/ncsid/test/net_iface_mock.cpp
index 4b071ed..5e2d223 100644
--- a/subprojects/ncsid/test/net_iface_mock.cpp
+++ b/subprojects/ncsid/test/net_iface_mock.cpp
@@ -14,6 +14,9 @@
 
 #include "net_iface_mock.h"
 
+#include <linux/if.h>
+#include <sys/ioctl.h>
+
 namespace mock
 {
 
diff --git a/subprojects/ncsid/test/net_iface_mock.h b/subprojects/ncsid/test/net_iface_mock.h
index 0ccf5bf..118ca03 100644
--- a/subprojects/ncsid/test/net_iface_mock.h
+++ b/subprojects/ncsid/test/net_iface_mock.h
@@ -18,6 +18,7 @@
 
 #include <net_iface.h>
 
+#include <string>
 #include <vector>
 
 namespace mock
diff --git a/subprojects/ncsid/test/nic_mock.cpp b/subprojects/ncsid/test/nic_mock.cpp
index c435ffa..20f7f56 100644
--- a/subprojects/ncsid/test/nic_mock.cpp
+++ b/subprojects/ncsid/test/nic_mock.cpp
@@ -15,9 +15,11 @@
 #include "nic_mock.h"
 
 #include "platforms/nemora/portable/ncsi.h"
+#include "platforms/nemora/portable/ncsi_server.h"
 
 #include <algorithm>
 #include <cstddef>
+#include <cstring>
 #include <stdexcept>
 
 namespace mock
diff --git a/subprojects/ncsid/test/nic_mock.h b/subprojects/ncsid/test/nic_mock.h
index 13e5959..be314f8 100644
--- a/subprojects/ncsid/test/nic_mock.h
+++ b/subprojects/ncsid/test/nic_mock.h
@@ -18,12 +18,11 @@
 
 #include "platforms/nemora/portable/ncsi.h"
 #include "platforms/nemora/portable/ncsi_fsm.h"
-#include "platforms/nemora/portable/ncsi_server.h"
+#include "platforms/nemora/portable/net_types.h"
 
 #include <netinet/in.h>
 
 #include <cstdint>
-#include <cstring>
 #include <vector>
 
 namespace mock
diff --git a/subprojects/ncsid/test/sock_test.cpp b/subprojects/ncsid/test/sock_test.cpp
index 6e034de..463bc6f 100644
--- a/subprojects/ncsid/test/sock_test.cpp
+++ b/subprojects/ncsid/test/sock_test.cpp
@@ -15,7 +15,13 @@
 #include "ncsi_sockio.h"
 #include "net_iface_mock.h"
 
-#include <gmock/gmock.h>
+#include <linux/if.h>
+
+#include <vector>
+
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 TEST(TestSockIO, TestBind)
 {