diff -ruN ncpfs-2.2.6.orig/include/ncp/ipxlib.h ncpfs-2.2.6/include/ncp/ipxlib.h
--- ncpfs-2.2.6.orig/include/ncp/ipxlib.h	2005-01-28 03:35:59 +1000
+++ ncpfs-2.2.6/include/ncp/ipxlib.h	2006-10-27 17:23:53 +1100
@@ -64,12 +64,12 @@
 struct sap_server_ident
 {
 	u_int16_t	server_type __attribute__((packed));
-	char		server_name[48] __attribute__((packed));
+	char		server_name[48];
 	IPXNet		server_network __attribute__((packed));
 #ifdef SWIG
-	u_int8_t	server_node[6] __attribute__((packed));
+	u_int8_t	server_node[6];
 #else
-	IPXNode		server_node __attribute__((packed));
+	IPXNode		server_node;
 #endif
 	IPXPort		server_port __attribute__((packed));
 	u_int16_t	intermediate_network __attribute__((packed));
@@ -87,7 +87,7 @@
 struct ipx_rip_packet
 {
 	u_int16_t		operation __attribute__((packed));
-	struct ipx_rt_def	rt[1] __attribute__((packed));
+	struct ipx_rt_def	rt[1];
 };
 
 #ifdef SWIG
diff -ruN ncpfs-2.2.6.orig/include/ncp/kernel/ncp.h ncpfs-2.2.6/include/ncp/kernel/ncp.h
--- ncpfs-2.2.6.orig/include/ncp/kernel/ncp.h	2005-01-28 03:35:59 +1000
+++ ncpfs-2.2.6/include/ncp/kernel/ncp.h	2006-10-27 17:22:18 +1100
@@ -53,12 +53,12 @@
 
 struct ncp_request_header {
 	u_int16_t type __attribute__((packed));
-	u_int8_t  sequence __attribute__((packed));
-	u_int8_t  conn_low __attribute__((packed));
-	u_int8_t  task __attribute__((packed));
-	u_int8_t  conn_high __attribute__((packed));
-	u_int8_t  function __attribute__((packed));
-	u_int8_t  data[0] __attribute__((packed));
+	u_int8_t  sequence;
+	u_int8_t  conn_low;
+	u_int8_t  task;
+	u_int8_t  conn_high;
+	u_int8_t  function;
+	u_int8_t  data[0];
 };
 
 #define NCP_REPLY                (0x3333)
@@ -66,13 +66,13 @@
 
 struct ncp_reply_header {
 	u_int16_t type __attribute__((packed));
-	u_int8_t sequence __attribute__((packed));
-	u_int8_t conn_low __attribute__((packed));
-	u_int8_t task __attribute__((packed));
-	u_int8_t conn_high __attribute__((packed));
-	u_int8_t completion_code __attribute__((packed));
-	u_int8_t connection_state __attribute__((packed));
-	u_int8_t data[0] __attribute__((packed));
+	u_int8_t sequence;
+	u_int8_t conn_low;
+	u_int8_t task;
+	u_int8_t conn_high;
+	u_int8_t completion_code;
+	u_int8_t connection_state;
+	u_int8_t data[0];
 };
 
 #define NCP_VOLNAME_LEN (16)
@@ -200,7 +200,7 @@
 	u_int32_t EAKeySize __attribute__((packed));
 	u_int32_t NSCreator __attribute__((packed));
 %pragma(swig) readonly
-	u_int8_t nameLen __attribute__((packed));
+	u_int8_t nameLen;
 %pragma(swig) readwrite
 	byteLenPrefixCharArray entryName[255] __attribute__((packed));
 };
@@ -230,8 +230,8 @@
 	u_int32_t EAKeyCount __attribute__((packed));
 	u_int32_t EAKeySize __attribute__((packed));
 	u_int32_t NSCreator __attribute__((packed));
-	u_int8_t nameLen __attribute__((packed));
-	u_int8_t entryName[256] __attribute__((packed));
+	u_int8_t nameLen;
+	u_int8_t entryName[256];
 };
 #endif
 
@@ -273,7 +273,7 @@
 	int opened;
 	int access;
 	u_int32_t server_file_handle __attribute__((packed));
-	u_int8_t open_create_action __attribute__((packed));
+	u_int8_t open_create_action;
 	fixedArray file_handle[6] __attribute__((packed));
 };
 #else
@@ -282,13 +282,13 @@
 	int opened;
 	int access;
 	u_int32_t server_file_handle __attribute__((packed));
-	u_int8_t open_create_action __attribute__((packed));
-	u_int8_t file_handle[6] __attribute__((packed));
+	u_int8_t open_create_action;
+	u_int8_t file_handle[6];
 };
 #endif
 
 struct nw_search_sequence {
-	u_int8_t volNumber __attribute__((packed));
+	u_int8_t volNumber;
 	u_int32_t dirBase __attribute__((packed));
 	u_int32_t sequence __attribute__((packed));
 };
diff -ruN ncpfs-2.2.6.orig/include/ncp/kernel/route.h ncpfs-2.2.6/include/ncp/kernel/route.h
--- ncpfs-2.2.6.orig/include/ncp/kernel/route.h	1970-01-01 10:00:00 +1000
+++ ncpfs-2.2.6/include/ncp/kernel/route.h	2006-10-27 15:56:31 +1100
@@ -0,0 +1,7 @@
+#ifndef __KERNEL_ROUTE_H__
+#define __KERNEL_ROUTE_H__
+
+#include <net/route.h>
+
+#endif	/* __KERNEL_ROUTE_H__ */
+
diff -ruN ncpfs-2.2.6.orig/include/ncp/ncp.h ncpfs-2.2.6/include/ncp/ncp.h
--- ncpfs-2.2.6.orig/include/ncp/ncp.h	2005-01-28 03:35:59 +1000
+++ ncpfs-2.2.6/include/ncp/ncp.h	2006-10-27 17:23:07 +1100
@@ -95,7 +95,7 @@
 #ifdef SWIG
 	fixedArray node[IPX_NODE_LEN];
 #else
-	u_int8_t node[IPX_NODE_LEN] __attribute__((packed));
+	u_int8_t node[IPX_NODE_LEN];
 #endif
 	u_int16_t port __attribute__((packed));
 };
@@ -140,7 +140,7 @@
 	u_int16_t JobType __attribute__((packed));
 	u_int16_t JobPosition __attribute__((packed));
 	u_int16_t JobControlFlags __attribute__((packed));
-	u_int8_t FileNameLen __attribute__((packed));
+	u_int8_t FileNameLen;
 	byteLenPrefixCharArray JobFileName[13] __attribute__((packed));
 	u_int32_t JobFileHandle __attribute__((packed));
 	u_int32_t ServerStation __attribute__((packed));
@@ -163,20 +163,20 @@
 	u_int32_t ClientTask __attribute__((packed));
 	u_int32_t ClientObjectID __attribute__((packed));
 	u_int32_t TargetServerID __attribute__((packed));
-	u_int8_t TargetExecTime[6] __attribute__((packed));
-	u_int8_t JobEntryTime[6] __attribute__((packed));
+	u_int8_t TargetExecTime[6];
+	u_int8_t JobEntryTime[6];
 	u_int32_t JobNumber __attribute__((packed));
 	u_int16_t JobType __attribute__((packed));
 	u_int16_t JobPosition __attribute__((packed));
 	u_int16_t JobControlFlags __attribute__((packed));
-	u_int8_t FileNameLen __attribute__((packed));
-	char JobFileName[13] __attribute__((packed));
+	u_int8_t FileNameLen;
+	char JobFileName[13];
 	u_int32_t JobFileHandle __attribute__((packed));
 	u_int32_t ServerStation __attribute__((packed));
 	u_int32_t ServerTaskNumber __attribute__((packed));
 	u_int32_t ServerObjectID __attribute__((packed));
-	char JobTextDescription[50] __attribute__((packed));
-	char ClientRecordArea[152] __attribute__((packed));
+	char JobTextDescription[50];
+	char ClientRecordArea[152];
 };
 
 struct queue_job {
@@ -202,8 +202,8 @@
 
 #ifdef SWIG
 struct print_job_record {
-	u_int8_t Version __attribute__((packed));
-	u_int8_t TabSize __attribute__((packed));
+	u_int8_t Version;
+	u_int8_t TabSize;
 	u_int16_t Copies __attribute__((packed));
 	u_int16_t CtrlFlags __attribute__((packed));
 	u_int16_t Lines __attribute__((packed));
@@ -217,18 +217,18 @@
 };
 #else
 struct print_job_record {
-	u_int8_t Version __attribute__((packed));
-	u_int8_t TabSize __attribute__((packed));
+	u_int8_t Version;
+	u_int8_t TabSize;
 	u_int16_t Copies __attribute__((packed));
 	u_int16_t CtrlFlags __attribute__((packed));
 	u_int16_t Lines __attribute__((packed));
 	u_int16_t Rows __attribute__((packed));
-	char FormName[16] __attribute__((packed));
-	u_int8_t Reserved[6] __attribute__((packed));
-	char BannerName[13] __attribute__((packed));
-	char FnameBanner[13] __attribute__((packed));
-	char FnameHeader[14] __attribute__((packed));
-	char Path[80] __attribute__((packed));
+	char FormName[16];
+	u_int8_t Reserved[6];
+	char BannerName[13];
+	char FnameBanner[13];
+	char FnameHeader[14];
+	char Path[80];
 };
 #endif
 
diff -ruN ncpfs-2.2.6.orig/include/ncp/ncplib.h ncpfs-2.2.6/include/ncp/ncplib.h
--- ncpfs-2.2.6.orig/include/ncp/ncplib.h	2006-10-27 15:36:45 +1100
+++ ncpfs-2.2.6/include/ncp/ncplib.h	2006-10-27 17:24:13 +1100
@@ -462,24 +462,24 @@
 #else
 struct ncp_file_server_info
 {
-	u_int8_t ServerName[48] __attribute__((packed));
-	u_int8_t FileServiceVersion __attribute__((packed));
-	u_int8_t FileServiceSubVersion __attribute__((packed));
+	u_int8_t ServerName[48];
+	u_int8_t FileServiceVersion;
+	u_int8_t FileServiceSubVersion;
 	u_int16_t MaximumServiceConnections __attribute__((packed));
 	u_int16_t ConnectionsInUse __attribute__((packed));
 	u_int16_t NumberMountedVolumes __attribute__((packed));
-	u_int8_t Revision __attribute__((packed));
-	u_int8_t SFTLevel __attribute__((packed));
-	u_int8_t TTSLevel __attribute__((packed));
+	u_int8_t Revision;
+	u_int8_t SFTLevel;
+	u_int8_t TTSLevel;
 	u_int16_t MaxConnectionsEverUsed __attribute__((packed));
-	u_int8_t AccountVersion __attribute__((packed));
-	u_int8_t VAPVersion __attribute__((packed));
-	u_int8_t QueueVersion __attribute__((packed));
-	u_int8_t PrintVersion __attribute__((packed));
-	u_int8_t VirtualConsoleVersion __attribute__((packed));
-	u_int8_t RestrictionLevel __attribute__((packed));
-	u_int8_t InternetBridge __attribute__((packed));
-	u_int8_t Reserved[60] __attribute__((packed));
+	u_int8_t AccountVersion;
+	u_int8_t VAPVersion;
+	u_int8_t QueueVersion;
+	u_int8_t PrintVersion;
+	u_int8_t VirtualConsoleVersion;
+	u_int8_t RestrictionLevel;
+	u_int8_t InternetBridge;
+	u_int8_t Reserved[60];
 };
 #endif
 
@@ -592,7 +592,7 @@
 #ifdef SWIG
 	fixedArray Node[6];
 #else
-	u_int8_t Node[6] __attribute__((packed));
+	u_int8_t Node[6];
 #endif
 	u_int16_t Socket __attribute__((packed));
 };
@@ -602,32 +602,32 @@
 #ifdef SWIG
 	fixedArray AccountExpireDate[3];
 #else
-	u_int8_t AccountExpireDate[3] __attribute__((packed));
+	u_int8_t AccountExpireDate[3];
 #endif	
-	u_int8_t Disabled __attribute__((packed));
+	u_int8_t Disabled;
 #ifdef SWIG
 	fixedArray PasswordExpireDate[3];
 #else	
-	u_int8_t PasswordExpireDate[3] __attribute__((packed));
+	u_int8_t PasswordExpireDate[3];
 #endif	
-	u_int8_t GraceLogins __attribute__((packed));
+	u_int8_t GraceLogins;
 	u_int16_t PasswordExpireInterval __attribute__((packed));
-	u_int8_t MaxGraceLogins __attribute__((packed));
-	u_int8_t MinPasswordLength __attribute__((packed));
+	u_int8_t MaxGraceLogins;
+	u_int8_t MinPasswordLength;
 	u_int16_t MaxConnections __attribute__((packed));
 #ifdef SWIG
 	fixedArray ConnectionTimeMask[42] __attribute__((packed));
 	fixedArray LastLogin[6] __attribute__((packed));
 #else	
-	u_int8_t ConnectionTimeMask[42] __attribute__((packed));
-	u_int8_t LastLogin[6] __attribute__((packed));
+	u_int8_t ConnectionTimeMask[42];
+	u_int8_t LastLogin[6];
 #endif	
-	u_int8_t RestrictionMask __attribute__((packed));
-	u_int8_t reserved __attribute__((packed));
+	u_int8_t RestrictionMask;
+	u_int8_t reserved;
 	u_int32_t MaxDiskUsage __attribute__((packed));
 	u_int16_t BadLoginCount __attribute__((packed));
 	u_int32_t BadLoginCountDown __attribute__((packed));
-	struct ncp_station_addr LastIntruder __attribute__((packed));
+	struct ncp_station_addr LastIntruder;
 };
 
 NWCCODE NWReadPropertyValue(NWCONN_HANDLE conn, const char *objName,