diff --git a/nsock/tests/ghlists.c b/nsock/tests/ghlists.c
index 54c026bcd..923db5df6 100644
--- a/nsock/tests/ghlists.c
+++ b/nsock/tests/ghlists.c
@@ -5,6 +5,8 @@
 
 #include "test-common.h"
 #include "../src/gh_list.h"
+/* For container_of */
+#include "../src/gh_heap.h"
 #include <stdint.h>
 #include <time.h>
 
diff --git a/nsock/tests/test-common.h b/nsock/tests/test-common.h
index 2f849f13b..d74646004 100644
--- a/nsock/tests/test-common.h
+++ b/nsock/tests/test-common.h
@@ -16,12 +16,6 @@
 #include <nsock.h>
 
 
-#if !defined(container_of)
-#define container_of(ptr, type, member) \
-        ((type *)((char *)(ptr)-(char *)(&((type *)0)->member)))
-#endif
-
-
 #define PORT_UDP    55234
 #define PORT_TCP    55235
 #define PORT_TCPSSL 55236