diff --git a/reactos/iface/addsys/genw32k.c b/reactos/iface/addsys/genw32k.c
index 18ea4062c39..1f2146834dd 100644
--- a/reactos/iface/addsys/genw32k.c
+++ b/reactos/iface/addsys/genw32k.c
@@ -1,4 +1,4 @@
-/* $Id: genw32k.c,v 1.6 2003/12/03 21:50:49 gvg Exp $
+/* $Id: genw32k.c,v 1.7 2004/04/07 00:14:05 hyperion Exp $
  *
  * COPYRIGHT:             See COPYING in the top level directory
  * PROJECT:               ReactOS version of ntdll
@@ -88,7 +88,7 @@ char    *stmp;
 			 * Now write the current system call's name
 			 * in the service table.
 			 */
-			fprintf(out,"\t\t{ (ULONG)%s }",name);
+			fprintf(out,"\t\t(PVOID (NTAPI *)(VOID))%s",name);
 
 			/* Next system call index */
 			sys_call_idx++;
@@ -143,7 +143,7 @@ char    *stmp;
 			 * Now write the current system call's ID
 			 * in the service table along with its Parameters Size.
 			 */
-			fprintf(out,"\t\t{ %d }",atoi(nr_args) * sizeof(void*));
+			fprintf(out,"\t\t%d",atoi(nr_args) * sizeof(void*));
 
 			/* Next system call index */
 			sys_call_idx++;
diff --git a/reactos/iface/native/genntdll.c b/reactos/iface/native/genntdll.c
index 68bec3cf2aa..a4bb9495763 100644
--- a/reactos/iface/native/genntdll.c
+++ b/reactos/iface/native/genntdll.c
@@ -1,4 +1,4 @@
-/* $Id: genntdll.c,v 1.13 2003/12/17 01:46:08 hyperion Exp $
+/* $Id: genntdll.c,v 1.14 2004/04/07 00:14:05 hyperion Exp $
  *
  * COPYRIGHT:             See COPYING in the top level directory
  * PROJECT:               ReactOS version of ntdll
@@ -135,7 +135,7 @@ char    *stmp;
 			 * Now write the current system call's name
 			 * in the service table.
 			 */
-			fprintf(out,"\t\t{ (ULONG)%s }",name);
+			fprintf(out,"\t\t(PVOID (NTAPI *)(VOID))%s",name);
 		}
 	}
 	/* Close the service table (C syntax) */
@@ -194,7 +194,7 @@ char    *stmp;
 			 * Now write the current system call's ID
 			 * in the service table along with its Parameters Size.
 			 */
-			fprintf(out,"\t\t{ %s }",nr_args);
+			fprintf(out,"\t\t%s",nr_args);
 		}
 	}
 	/*
diff --git a/reactos/include/ntos/service.h b/reactos/include/ntos/service.h
index 1e07fcc77ed..59e8b0ab934 100755
--- a/reactos/include/ntos/service.h
+++ b/reactos/include/ntos/service.h
@@ -9,28 +9,21 @@
 
 #ifndef __USE_W32API
 
-#pragma pack(1)
-
 /* System Service Dispatch Table */
-typedef struct t_SSDT {
-                ULONG           SysCallPtr;
-} SSDT, *PSSDT;
+typedef PVOID (NTAPI * SSDT)(VOID);
+typedef SSDT * PSSDT;
 
 /* System Service Parameters Table */
-typedef struct t_SSPT   {
-                unsigned int    ParamBytes;
-} SSPT, *PSSPT;
+typedef UCHAR SSPT, *PSSPT;
 
 typedef struct t_KeServiceDescriptorTableEntry {
                 PSSDT               SSDT;
                 PULONG              ServiceCounterTable;
-                unsigned int        NumberOfServices;
+                ULONG               NumberOfServices;
                 PSSPT               SSPT;
 
 } SSDT_ENTRY, *PSSDT_ENTRY;
 
-#pragma pack()
-
 #endif /* __USE_W32API */
 
 
diff --git a/reactos/w32api/include/ddk/winddk.h b/reactos/w32api/include/ddk/winddk.h
index 2625c8127d1..7eea53d20f9 100644
--- a/reactos/w32api/include/ddk/winddk.h
+++ b/reactos/w32api/include/ddk/winddk.h
@@ -7114,14 +7114,11 @@ KeAcquireSpinLock(
   OUT PKIRQL  OldIrql);
 
 /* System Service Dispatch Table */
-typedef struct _SSDT {
-  ULONG  SysCallPtr;
-} SSDT, *PSSDT;
+typedef PVOID (NTAPI * SSDT)(VOID);
+typedef SSDT * PSSDT;
 
 /* System Service Parameters Table */
-typedef struct _SSPT {
-  ULONG  ParamBytes;
-} SSPT, *PSSPT;
+typedef UCHAR SSPT, * PSSPT;
 
 typedef struct _SSDT_ENTRY {
 	PSSDT  SSDT;