From: Daniel Glassey <wdg@debian.org>
Date: Thu, 1 Nov 2018 10:27:07 +0100
Subject: allow abi-compliance-checker to compile headers

---
 include/canon_abbrevs.h | 2 ++
 include/femain.h        | 5 ++++-
 include/hebrewmcim.h    | 4 ++--
 include/sapphire.h      | 5 +++++
 include/zcom.h          | 1 +
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/include/canon_abbrevs.h b/include/canon_abbrevs.h
index a5fc320..60dea94 100644
--- a/include/canon_abbrevs.h
+++ b/include/canon_abbrevs.h
@@ -24,6 +24,8 @@
 #ifndef CANON_ABBREVS_H
 #define CANON_ABBREVS_H
 
+#include <versificationmgr.h>
+
 SWORD_NAMESPACE_START
 
 
diff --git a/include/femain.h b/include/femain.h
index 3eec2c6..01c0042 100644
--- a/include/femain.h
+++ b/include/femain.h
@@ -23,12 +23,15 @@
 #ifndef FEMAIN_H
 #define FEMAIN_H
 
+#include <list>
+#include <swdisp.h>
+
 class FEMain
 {
 public:
   FEMain ();
   virtual ~FEMain ();
-  list < SWDisplay * >displays;	// so we can delete each display we create
+  std::list < sword::SWDisplay * >displays;	// so we can delete each display we create
 };
 
 #endif
diff --git a/include/hebrewmcim.h b/include/hebrewmcim.h
index ffcb9a1..43b97b3 100644
--- a/include/hebrewmcim.h
+++ b/include/hebrewmcim.h
@@ -42,8 +42,8 @@ class SWDLLEXPORT HebrewMCIM : public SWInputMethod {
 
     void init();
     int subst[255];
-    map<int, int> subst2[12];
-    map<int, int*> multiChars;
+    std::map<int, int> subst2[12];
+    std::map<int, int*> multiChars;
 
 public:
     HebrewMCIM();
diff --git a/include/sapphire.h b/include/sapphire.h
index 96f3bf5..20aa53d 100644
--- a/include/sapphire.h
+++ b/include/sapphire.h
@@ -37,6 +37,9 @@
  * results of assignments need to be reduced to 8 bits with
  * & 0xFF or % 0x100, whichever is faster.
  */  
+
+#ifndef SAPPHIRE_H
+#define SAPPHIRE_H
   
 #ifndef NULL
 #define NULL 0
@@ -80,3 +83,5 @@ unsigned *keypos); public:sapphire (unsigned char
 
 
 SWORD_NAMESPACE_END
+
+#endif //SAPPHIRE_H
diff --git a/include/zcom.h b/include/zcom.h
index 560b650..9a990d8 100644
--- a/include/zcom.h
+++ b/include/zcom.h
@@ -25,6 +25,7 @@
 #define ZCOM_H
 
 #include <swcom.h>
+#include <zverse.h>
 
 #include <defs.h>