diff --git a/server/Mac/mf_audin.c b/server/Mac/mf_audin.c
index afd57f231..aaabafa96 100644
--- a/server/Mac/mf_audin.c
+++ b/server/Mac/mf_audin.c
@@ -25,6 +25,7 @@
 #include "mfreerdp.h"
 
 #include "mf_audin.h"
+#include "mf_interface.h"
 
 #include <freerdp/server/server-common.h>
 #include <freerdp/log.h>
diff --git a/server/Mac/mf_audin.h b/server/Mac/mf_audin.h
index 78ad76706..31edffa73 100644
--- a/server/Mac/mf_audin.h
+++ b/server/Mac/mf_audin.h
@@ -24,7 +24,7 @@
 #include <freerdp/freerdp.h>
 #include <freerdp/listener.h>
 
-#include "mf_interface.h"
+#include "mf_types.h"
 #include "mfreerdp.h"
 
 BOOL mf_peer_audin_init(mfPeerContext* context);
diff --git a/server/Mac/mf_interface.h b/server/Mac/mf_interface.h
index 5e0812c4f..6ba86f33a 100644
--- a/server/Mac/mf_interface.h
+++ b/server/Mac/mf_interface.h
@@ -45,8 +45,7 @@
 #include "mf_audin.h"
 #endif
 
-typedef struct mf_info mfInfo;
-typedef struct mf_peer_context mfPeerContext;
+#include "mf_types.h"
 
 struct mf_peer_context
 {
@@ -63,8 +62,10 @@ struct mf_peer_context
 #ifdef WITH_SERVER_CHANNELS
 	HANDLE vcm;
 #endif
+
 #ifdef CHANNEL_AUDIN_SERVER
 	audin_server_context* audin;
+#endif
 
 #ifdef CHANNEL_RDPSND_SERVER
 	RdpsndServerContext* rdpsnd;
diff --git a/server/Mac/mf_rdpsnd.c b/server/Mac/mf_rdpsnd.c
index a17a3fe32..63c208255 100644
--- a/server/Mac/mf_rdpsnd.c
+++ b/server/Mac/mf_rdpsnd.c
@@ -25,6 +25,7 @@
 
 #include "mf_info.h"
 #include "mf_rdpsnd.h"
+#include "mf_interface.h"
 
 #include <winpr/sysinfo.h>
 #include <freerdp/server/server-common.h>
diff --git a/server/Mac/mf_rdpsnd.h b/server/Mac/mf_rdpsnd.h
index 3b3da2a6e..28bcb0dc4 100644
--- a/server/Mac/mf_rdpsnd.h
+++ b/server/Mac/mf_rdpsnd.h
@@ -27,7 +27,7 @@
 #include <freerdp/listener.h>
 #include <freerdp/server/rdpsnd.h>
 
-#include "mf_interface.h"
+#include "mf_types.h"
 #include "mfreerdp.h"
 
 void mf_rdpsnd_derive_buffer_size(AudioQueueRef audioQueue,
diff --git a/server/Mac/mf_types.h b/server/Mac/mf_types.h
new file mode 100644
index 000000000..e33be83b3
--- /dev/null
+++ b/server/Mac/mf_types.h
@@ -0,0 +1,33 @@
+/**
+ * FreeRDP: A Remote Desktop Protocol Client
+ * FreeRDP Mac OS X Server
+ *
+ * Copyright 2023 Armin Novak <anovak@thincst.com>
+ * Copyright 2023 Thincast Technologies GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef FREERDP_SERVER_MAC_TYPES_H
+#define FREERDP_SERVER_MAC_TYPES_H
+
+#include <pthread.h>
+
+#include <freerdp/config.h>
+
+#include <winpr/crt.h>
+
+typedef struct mf_info mfInfo;
+typedef struct mf_peer_context mfPeerContext;
+
+#endif /* FREERDP_SERVER_MAC_TYPES_H */