--- libreoffice-4.3.1/external/np_sdk/npsdk/npunix.c.orig	2014-08-14 15:57:15.387000000 +0400
+++ libreoffice-4.3.1/external/np_sdk/npsdk/npunix.c	2014-08-14 15:57:29.099000000 +0400
@@ -56,7 +56,7 @@
 #define XP_UNIX 1
 
 #include <stdio.h>
-#include "npapi.h"
+#include "../inc/npapi.h"
 #include "npupp.h"
 #include "plugin.h"
 
--- libreoffice-4.3.1/external/np_sdk/npsdk/npupp.h.orig	2014-08-14 15:46:42.650000000 +0400
+++ libreoffice-4.3.1/external/np_sdk/npsdk/npupp.h	2014-08-14 15:56:45.554000000 +0400
@@ -48,8 +48,14 @@
 #define GENERATINGCFM 0
 #endif
 
-#ifndef _NPAPI_H_
-#include "npapi.h"
+#ifndef npapi_h_
+#include "../inc/npapi.h"
+#endif
+
+#if defined(__OS2__)
+#define NP_LOADDS _System
+#else
+#define NP_LOADDS
 #endif
 
 #include "jri.h"
--- libreoffice-4.3.1/external/np_sdk/npsdk/npwin.cxx.orig	2014-08-14 15:44:23.643000000 +0400
+++ libreoffice-4.3.1/external/np_sdk/npsdk/npwin.cxx	2014-08-14 15:44:46.609000000 +0400
@@ -35,7 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "npapi.h"
+#include "../inc/npapi.h"
 #include "npupp.h"
 #include "plugin.h"
 
--- libreoffice-4.3.1/external/np_sdk/npsdk/plugin.h.orig	2014-08-14 15:48:07.948000000 +0400
+++ libreoffice-4.3.1/external/np_sdk/npsdk/plugin.h	2014-08-14 15:56:04.674000000 +0400
@@ -20,7 +20,13 @@
 #ifndef INCLUDED_NP_SDK_MOZSRC_PLUGIN_H
 #define INCLUDED_NP_SDK_MOZSRC_PLUGIN_H
 
-#include "npapi.h"
+#include "../inc/npapi.h"
+
+#if defined(__OS2__)
+#define NP_LOADDS _System
+#else
+#define NP_LOADDS
+#endif
 
 /* OpenOffice.org/LibreOffice modified the implementations of NP_Initialize and
    NP_Shutdown in external/np_sdk/npsdk/ to call NPP_Initialize and NPP_Shutdown, resp.,