--- build/ooo310-m11/np_sdk/mozsrc/npapi.h.orig	2009-07-12 16:12:42.604105232 +0200
+++ build/ooo310-m11/np_sdk/mozsrc/npapi.h	2009-07-12 16:28:59.901456708 +0200
@@ -42,8 +42,9 @@
  *  Netscape client plug-in API spec
  */
 
-#ifndef _NPAPI_H_
+#if !defined(_NPAPI_H_) && !defined(npapi_h_)
 #define _NPAPI_H_
+#define npapi_h_
 
 #ifdef __OS2__
 #pragma pack(1)