More tweaks on Linux and Solaris.
diff --git a/src/lib9/_p9dir.c b/src/lib9/_p9dir.c
index d94208c..4375222 100644
--- a/src/lib9/_p9dir.c
+++ b/src/lib9/_p9dir.c
@@ -4,13 +4,19 @@
#include <sys/types.h>
#include <sys/stat.h>
-#ifdef _HAVEDISKLABEL
-#include <sys/disklabel.h>
-#endif
#include <dirent.h>
#include <pwd.h>
#include <grp.h>
+#if defined(__FreeBSD__)
+#include <sys/disklabel.h>
+#define _HAVEDISKLABEL
+#endif
+
+#if !defined(__linux__) && !defined(__sun__)
+#define _HAVESTGEN
+#endif
+
int
_p9dir(struct stat *st, char *name, Dir *d, char **str, char *estr)
{
