    void unhide_if_necessary(ea_t ea);
    void hide_if_necessary(void);
  protected:
-@@ -117,7 +122,9 @@
+@@ -117,7 +124,9 @@
  class location_t : public curloc
  {
    typedef curloc inherited;

 //      Utility functions
diff -ur idasdk-versions/5.3/include/expr.hpp swigsdk-versions/5.3/include/expr.hpp
--- idasdk-versions/5.3/include/expr.hpp	2008-07-03 16:28:00.000000000 +0300
+++ swigsdk-versions/5.3/include/expr.hpp	2008-09-30 19:30:22.000000000 +0300
@@ -67,12 +67,14 @@
                                 // number of arguments. The actual number of
                                 // arguments will be passed in 'num'
 
+#ifndef SWIG
   union
   {
     char *str;                  // VT_STR
     sval_t num;                 // VT_LONG
     ushort e[6];                // VT_FLOAT
   };
+#endif // SWIG
 

 idaman void ida_export init_lines_array(char *lnar[],int maxsize);// initialization function for it
diff -ur idasdk-versions/5.3/include/moves.hpp swigsdk-versions/5.3/include/moves.hpp
--- idasdk-versions/5.3/include/moves.hpp	2008-05-04 21:36:00.000000000 +0300
+++ swigsdk-versions/5.3/include/moves.hpp	2008-11-02 19:37:47.000000000 +0200
@@ -23,6 +23,7 @@
     { return !(*this == r); }
 };
 
+#ifndef SWIG
 // Helper functions. Should not be called directly!
 class curloc;
 class location_t;
@@ -46,13 +47,19 @@
 
 DEFINE_CURLOC_HELPERS(idaman)
 DEFINE_LOCATION_HELPERS(idaman)
+#else
+#define DEFINE_CURLOC_HELPERS(decl)
+#define DEFINE_LOCATION_HELPERS(decl)
+#endif // SWIG
 
 #define CURLOC_SISTACK_ITEMS 4
