diff --git a/include/ipx.h b/include/ipx.h
new file mode 100644
index 0000000..5f3476e
--- /dev/null
+++ b/include/ipx.h
@@ -0,0 +1,78 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+#ifndef _IPX_H_
+#define _IPX_H_
+
+#include <linux/types.h>
+#include <linux/sockios.h>
+#include <linux/socket.h>
+
+#define IPX_NODE_LEN	6
+#define IPX_MTU		576
+
+struct sockaddr_ipx {
+	__kernel_sa_family_t sipx_family;
+	__be16		sipx_port;
+	__be32		sipx_network;
+	unsigned char 	sipx_node[IPX_NODE_LEN];
+	__u8		sipx_type;
+	unsigned char	sipx_zero;	/* 16 byte fill */
+};
+
+/*
+ * So we can fit the extra info for SIOCSIFADDR into the address nicely
+ */
+#define sipx_special	sipx_port
+#define sipx_action	sipx_zero
+#define IPX_DLTITF	0
+#define IPX_CRTITF	1
+
+struct ipx_route_definition {
+	__be32        ipx_network;
+	__be32        ipx_router_network;
+	unsigned char ipx_router_node[IPX_NODE_LEN];
+};
+
+struct ipx_interface_definition {
+	__be32        ipx_network;
+	unsigned char ipx_device[16];
+	unsigned char ipx_dlink_type;
+#define IPX_FRAME_NONE		0
+#define IPX_FRAME_SNAP		1
+#define IPX_FRAME_8022		2
+#define IPX_FRAME_ETHERII	3
+#define IPX_FRAME_8023		4
+#define IPX_FRAME_TR_8022       5 /* obsolete */
+	unsigned char ipx_special;
+#define IPX_SPECIAL_NONE	0
+#define IPX_PRIMARY		1
+#define IPX_INTERNAL		2
+	unsigned char ipx_node[IPX_NODE_LEN];
+};
+
+struct ipx_config_data {
+	unsigned char	ipxcfg_auto_select_primary;
+	unsigned char	ipxcfg_auto_create_interfaces;
+};
+
+/*
+ * OLD Route Definition for backward compatibility.
+ */
+
+struct ipx_route_def {
+	__be32		ipx_network;
+	__be32		ipx_router_network;
+#define IPX_ROUTE_NO_ROUTER	0
+	unsigned char	ipx_router_node[IPX_NODE_LEN];
+	unsigned char	ipx_device[16];
+	unsigned short	ipx_flags;
+#define IPX_RT_SNAP		8
+#define IPX_RT_8022		4
+#define IPX_RT_BLUEBOOK		2
+#define IPX_RT_ROUTED		1
+};
+
+#define SIOCAIPXITFCRT		(SIOCPROTOPRIVATE)
+#define SIOCAIPXPRISLT		(SIOCPROTOPRIVATE + 1)
+#define SIOCIPXCFGDATA		(SIOCPROTOPRIVATE + 2)
+#define SIOCIPXNCPCONN		(SIOCPROTOPRIVATE + 3)
+#endif /* _IPX_H_ */
diff --git a/opt/xsockrt.c b/opt/xsockrt.c
index a43169c..0471a79 100644
--- a/opt/xsockrt.c
+++ b/opt/xsockrt.c
@@ -10,7 +10,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include <strings.h>
-#include <linux/ipx.h>
+#include "ipx.h"
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
diff --git a/src/ftrustee.c b/src/ftrustee.c
index 60131d5..f365f11 100644
--- a/src/ftrustee.c
+++ b/src/ftrustee.c
@@ -72,7 +72,7 @@ void set_guid(int gid, int uid)
       int k=getgroups(0, NULL);
       if (k > 0) {
         act_grouplist=(gid_t*)xmalloc((k+1) * sizeof(gid_t));
-        getgroups(k, act_grouplist+1);
+        if (getgroups(k, act_grouplist+1) < 0) {}
         *act_grouplist=(gid_t)k;
       }
     }