diff --git a/external/gpl2/mkhybrid/dist/desktop.c b/external/gpl2/mkhybrid/dist/desktop.c
index 9807353e21f5..d27e3c9aa2d4 100644
--- a/external/gpl2/mkhybrid/dist/desktop.c
+++ b/external/gpl2/mkhybrid/dist/desktop.c
@@ -22,9 +22,11 @@
 
 #ifdef APPLE_HYB
 
+#include <config.h>
 #include <string.h>
 #include <err.h>
-#include "hfs.h"
+#include "mkisofs.h"
+#include "volume.h"
 
 #define	DB	"Desktop DB"
 #define DBFC	"DMGR"
diff --git a/external/gpl2/mkhybrid/dist/libhfs_iso/hfs.h b/external/gpl2/mkhybrid/dist/libhfs_iso/hfs.h
index f62dcdee5460..b8267604def4 100644
--- a/external/gpl2/mkhybrid/dist/libhfs_iso/hfs.h
+++ b/external/gpl2/mkhybrid/dist/libhfs_iso/hfs.h
@@ -149,4 +149,5 @@ int hfs_rename(hfsvol *, char *, char *);
 #ifdef APPLE_HYB
 unsigned short hfs_get_drAllocPtr(hfsfile *);
 int hfs_set_drAllocPtr(hfsfile *, unsigned short, int size);
+void hfs_vsetbless(hfsvol *, unsigned long);
 #endif /* APPLE_HYB */
diff --git a/external/gpl2/mkhybrid/dist/mac_label.c b/external/gpl2/mkhybrid/dist/mac_label.c
index 0cffafb52850..765daa5f3843 100644
--- a/external/gpl2/mkhybrid/dist/mac_label.c
+++ b/external/gpl2/mkhybrid/dist/mac_label.c
@@ -23,6 +23,7 @@
 #include <mkisofs.h>
 #include "mac_label_proto.h"
 #include <mac_label.h>
+#include "data.h"
 
 int
 gen_mac_label(defer *mac_boot)
diff --git a/external/gpl2/mkhybrid/dist/mkisofs.h b/external/gpl2/mkhybrid/dist/mkisofs.h
index 18626c524500..c54082ed0886 100644
--- a/external/gpl2/mkhybrid/dist/mkisofs.h
+++ b/external/gpl2/mkhybrid/dist/mkisofs.h
@@ -433,6 +433,9 @@ extern int    DECL(check_prev_session, (struct directory_entry **, int len,
 				     struct stat *,
 				     struct directory_entry **));
 
+/* desktop.c */
+extern int make_desktop(hfsvol *, int);
+
 #ifdef	USE_SCG
 /* scsi.c */
 #ifdef __STDC__
diff --git a/external/gpl2/mkhybrid/dist/volume.h b/external/gpl2/mkhybrid/dist/volume.h
index 9f0b854dd8f5..c22fd693f209 100644
--- a/external/gpl2/mkhybrid/dist/volume.h
+++ b/external/gpl2/mkhybrid/dist/volume.h
@@ -20,4 +20,5 @@
 #define VOLUME_H
 
 extern int make_mac_volume(struct directory *, int);
+extern int write_fork(hfsfile *, long);
 #endif