diff --git a/include/ddk/wmilib.h b/include/ddk/wmilib.h
index 18d63aded76..a0a5bdc5f22 100644
--- a/include/ddk/wmilib.h
+++ b/include/ddk/wmilib.h
@@ -22,17 +22,6 @@ typedef struct _WMIGUIDREGINFO {
   ULONG Flags;
 } WMIGUIDREGINFO, *PWMIGUIDREGINFO;
 
-typedef struct _WMILIB_CONTEXT {
-  ULONG GuidCount;
-  PWMIGUIDREGINFO GuidList;
-  PWMI_QUERY_REGINFO QueryWmiRegInfo;
-  PWMI_QUERY_DATABLOCK QueryWmiDataBlock;
-  PWMI_SET_DATABLOCK SetWmiDataBlock;
-  PWMI_SET_DATAITEM SetWmiDataItem;
-  PWMI_EXECUTE_METHOD ExecuteWmiMethod;
-  PWMI_FUNCTION_CONTROL WmiFunctionControl;
-} WMILIB_CONTEXT, *PWMILIB_CONTEXT;
-
 typedef NTSTATUS
 (NTAPI *PWMI_QUERY_REGINFO) (
   IN OUT PDEVICE_OBJECT DeviceObject,
@@ -41,6 +30,14 @@ typedef NTSTATUS
   OUT PUNICODE_STRING *RegistryPath OPTIONAL,
   IN OUT PUNICODE_STRING MofResourceName,
   OUT PDEVICE_OBJECT *Pdo OPTIONAL);
+  
+typedef NTSTATUS
+(NTAPI *PWMI_FUNCTION_CONTROL) (
+  IN OUT PDEVICE_OBJECT DeviceObject,
+  IN OUT PIRP Irp,
+  IN ULONG GuidIndex,
+  IN WMIENABLEDISABLECONTROL Function,
+  IN BOOLEAN Enable);
 
 typedef NTSTATUS
 (NTAPI *PWMI_QUERY_DATABLOCK) (
@@ -53,6 +50,17 @@ typedef NTSTATUS
   IN ULONG BufferAvail,
   OUT PUCHAR Buffer OPTIONAL);
 
+typedef NTSTATUS
+(NTAPI *PWMI_EXECUTE_METHOD) (
+  IN OUT PDEVICE_OBJECT DeviceObject,
+  IN OUT PIRP Irp,
+  IN ULONG GuidIndex,
+  IN ULONG InstanceIndex,
+  IN ULONG MethodId,
+  IN ULONG InBufferSize,
+  IN ULONG OutBufferSize,
+  IN OUT PUCHAR Buffer);
+
 typedef NTSTATUS
 (NTAPI *PWMI_SET_DATABLOCK) (
   IN OUT PDEVICE_OBJECT DeviceObject,
@@ -72,24 +80,16 @@ typedef NTSTATUS
   IN ULONG BufferSize,
   IN PUCHAR Buffer);
 
-typedef NTSTATUS
-(NTAPI *PWMI_EXECUTE_METHOD) (
-  IN OUT PDEVICE_OBJECT DeviceObject,
-  IN OUT PIRP Irp,
-  IN ULONG GuidIndex,
-  IN ULONG InstanceIndex,
-  IN ULONG MethodId,
-  IN ULONG InBufferSize,
-  IN ULONG OutBufferSize,
-  IN OUT PUCHAR Buffer);
-
-typedef NTSTATUS
-(NTAPI *PWMI_FUNCTION_CONTROL) (
-  IN OUT PDEVICE_OBJECT DeviceObject,
-  IN OUT PIRP Irp,
-  IN ULONG GuidIndex,
-  IN WMIENABLEDISABLECONTROL Function,
-  IN BOOLEAN Enable);
+typedef struct _WMILIB_CONTEXT {
+  ULONG GuidCount;
+  PWMIGUIDREGINFO GuidList;
+  PWMI_QUERY_REGINFO QueryWmiRegInfo;
+  PWMI_QUERY_DATABLOCK QueryWmiDataBlock;
+  PWMI_SET_DATABLOCK SetWmiDataBlock;
+  PWMI_SET_DATAITEM SetWmiDataItem;
+  PWMI_EXECUTE_METHOD ExecuteWmiMethod;
+  PWMI_FUNCTION_CONTROL WmiFunctionControl;
+} WMILIB_CONTEXT, *PWMILIB_CONTEXT;
 
 #if (NTDDI_VERSION >= NTDDI_WIN2K)