diff --git a/src/goose/goose_receiver.h b/src/goose/goose_receiver.h
index 7ac661d8..4638adbe 100644
--- a/src/goose/goose_receiver.h
+++ b/src/goose/goose_receiver.h
@@ -30,15 +30,14 @@ extern "C" {
 
 #include <stdbool.h>
 
-typedef struct sEthernetSocket* EthernetSocket;
+#include "hal_ethernet.h"
+#include "goose_subscriber.h"
 
 /**
  * \addtogroup goose_api_group
  */
 /**@{*/
 
-typedef struct sGooseSubscriber* GooseSubscriber;
-
 typedef struct sGooseReceiver* GooseReceiver;
 
 /**
diff --git a/src/sampled_values/sv_subscriber.h b/src/sampled_values/sv_subscriber.h
index e3760e99..8bfe10ed 100644
--- a/src/sampled_values/sv_subscriber.h
+++ b/src/sampled_values/sv_subscriber.h
@@ -26,13 +26,12 @@
 
 #include "libiec61850_common_api.h"
 #include "iec61850_common.h"
+#include "hal_ethernet.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-typedef struct sEthernetSocket* EthernetSocket;
-
 /**
  * \defgroup sv_subscriber_api_group IEC 61850 Sampled Values (SV) subscriber API
  *