Include of nsIOService.h was somehow including <os2h> later without #defines we need - solution is to add #define INCL_ statements at the beginning

netwerk/base/src/nsIOServiceOS2.cpp

@@ -38,17 +38,13 @@
  * ***** END LICENSE BLOCK ***** */
 
 /* OS/2-specific local file uri parsing */
+#define INCL_DOSERRORS
+#define INCL_DOS
 #include "nsIOService.h"
 #include "nsEscape.h"
 #include "nsPrintfCString.h"
 #include "nsILocalFile.h"
 
-#define INCL_DOS
-#define INCL_DOSERRORS
-#define INCL_WIN
-#define INCL_GPI
-#include <os2.h>
-
 static int isleadbyte(int c);
 
 NS_IMETHODIMP