There's no painless way to do this, but it needs to be done --

the only reason any of the Windows code was in CPP files was
because the MS compiler doesn't support C99.  Switch to using
MinGW, and that problem goes away, so we can rename the files back.

client/include/hidpi.h

@@ -20,7 +20,7 @@ Environment:
 #define   __HIDPI_H__
 
 #include <pshpack4.h>
-
+typedef LONG NTSTATUS;
 // Please include "hidsdi.h" to use the user space (dll / parser)
 // Please include "hidpddi.h" to use the kernel space parser
 

client/include/hidsdi.h

@@ -29,7 +29,7 @@ Environment:
 //#include <win32.h>
 //#include <basetyps.h>
 
-typedef LONG NTSTATUS;
+//typedef LONG NTSTATUS;
 #include "hidusage.h"
 #include "hidpi.h"