diff --git a/lib/isc/include/isc/socket.h b/lib/isc/include/isc/socket.h
index 73c75fa82e..016fbe1a18 100644
--- a/lib/isc/include/isc/socket.h
+++ b/lib/isc/include/isc/socket.h
@@ -60,6 +60,7 @@
  ***/
 
 #include <isc/lang.h>
+#include <isc/types.h>
 #include <isc/boolean.h>
 #include <isc/bufferlist.h>
 #include <isc/result.h>
@@ -87,10 +88,6 @@ ISC_LANG_BEGINDECLS
  *** Types
  ***/
 
-typedef struct isc_socket isc_socket_t;
-typedef struct isc_socketmgr isc_socketmgr_t;
-
-typedef struct isc_socketevent  isc_socketevent_t;
 struct isc_socketevent {
 	ISC_EVENT_COMMON(isc_socketevent_t);
 	isc_result_t		result;		/* OK, EOF, whatever else */
diff --git a/lib/isc/include/isc/types.h b/lib/isc/include/isc/types.h
index c5239f3811..ba27df1378 100644
--- a/lib/isc/include/isc/types.h
+++ b/lib/isc/include/isc/types.h
@@ -34,6 +34,9 @@ typedef unsigned int			isc_eventtype_t;
 typedef struct isc_event		isc_event_t;
 typedef ISC_LIST(struct isc_event)	isc_eventlist_t;
 typedef struct isc_task			isc_task_t;
+typedef struct isc_socket		isc_socket_t;
+typedef struct isc_socketmgr		isc_socketmgr_t;
+typedef struct isc_socketevent		isc_socketevent_t;
 typedef struct isc_taskmgr		isc_taskmgr_t;
 typedef struct isc_timer		isc_timer_t;
 typedef struct isc_timermgr		isc_timermgr_t;