diff -Naur C:\projects\mapserver_cvs\mapserver/cgiutil.h C:\projects\mapserver_cvs\mapserver_patch/cgiutil.h
--- C:\projects\mapserver_cvs\mapserver/cgiutil.h	2005-06-14 18:03:33.000000000 +0200
+++ C:\projects\mapserver_cvs\mapserver_patch/cgiutil.h	2006-02-19 20:45:57.007283200 +0100
@@ -80,7 +80,8 @@
 
 /*
 ** Function prototypes
-*/ 
+*/
+#ifndef SWIG
 MS_DLL_EXPORT  int loadParams(cgiRequestObj *);
 MS_DLL_EXPORT void getword(char *, char *, char);
 MS_DLL_EXPORT char *makeword_skip(char *, char, char);
@@ -97,5 +98,6 @@
 
 MS_DLL_EXPORT cgiRequestObj *msAllocCgiObj(void);
 MS_DLL_EXPORT void msFreeCgiObj(cgiRequestObj *request);
+#endif /*SWIG*/
 
 #endif /* CGIUTIL_H */
diff -Naur C:\projects\mapserver_cvs\mapserver/map.h C:\projects\mapserver_cvs\mapserver_patch/map.h
--- C:\projects\mapserver_cvs\mapserver/map.h	2006-02-18 21:59:12.000000000 +0100
+++ C:\projects\mapserver_cvs\mapserver_patch/map.h	2006-02-19 21:36:48.314848000 +0100
@@ -588,6 +588,7 @@
 #define MS_FILE_DEFAULT MS_FILE_MAP   
 
 
+#ifndef SWIG
 /* Filter object */    
 typedef enum 
 {
@@ -616,6 +617,7 @@
 
       
 }FilterEncodingNode;
+#endif /*SWIG*/
 
 
 /* Label path object - used to hold path and bounds of curved labels - Bug #1620 implementation. */
@@ -1037,6 +1039,7 @@
   struct map_obj *map;
 } legendObj;
 
+#ifndef SWIG
 typedef struct
 {
   double    dwhichlatitude;
@@ -1067,6 +1070,8 @@
 struct layerVTable;
 typedef struct layerVTable layerVTableObj;
 
+#endif /*SWIG*/
+
 /* LAYER OBJECT - basic unit of a map */
 typedef struct layer_obj {
 
@@ -1150,9 +1155,9 @@
   char *plugin_library_original; /* this is needed for mapfile writing */
   enum MS_CONNECTION_TYPE connectiontype;
 
+#ifndef SWIG
   layerVTableObj *vtable;
 
-#ifndef SWIG
   struct layer_obj *sameconnection;
   /* SDL has converted OracleSpatial, SDE, Graticules, MyGIS */
   void *layerinfo; /* all connection types should use this generic pointer to a vendor specific structure */
@@ -1243,7 +1248,9 @@
   double cellsize; /* in map units */
 
 
+#ifndef SWIG
   geotransformObj gt; /* rotation / geotransform */
+#endif /*SWIG*/
   rectObj saved_extent;
 
   enum MS_UNITS units; /* units of the projection */
@@ -1253,7 +1260,9 @@
   char *shapepath; /* where are the shape files located */
   char *mappath; /* path of the mapfile, all path are relative to this path */
 
+#ifndef SWIG
   paletteObj palette; /* holds a map palette */
+#endif /*SWIG*/
   colorObj imagecolor; /* holds the initial image color value */
 
 #ifdef SWIG
@@ -1301,6 +1310,7 @@
 } PDFObj; 
 #endif
 
+#ifndef SWIG
 typedef struct  {
   mapObj *map;
   FILE *stream;
@@ -1308,6 +1318,7 @@
   int streamclosed; /* track if a save image is done */
   int compressed; /*track if output is set to be svgz */
 } SVGObj;
+#endif /*SWIG*/
 
 /* IMAGE OBJECT - a wrapper for GD images */
 typedef struct {
@@ -1349,6 +1360,7 @@
  * If you add new functions to here, remember to update
  * populateVirtualTable in maplayer.c
  */
+#ifndef SWIG
 struct layerVTable {
     int (*LayerInitItemInfo)(layerObj *layer);
     void (*LayerFreeItemInfo)(layerObj *layer);
@@ -1377,6 +1389,7 @@
     int (*LayerCreateItems)(layerObj *layer, int nt);
     int (*LayerGetNumFeatures)(layerObj *layer);
 };
+#endif /*SWIG*/
 
 
 /* Function prototypes, wrapable */
diff -Naur C:\projects\mapserver_cvs\mapserver/maphash.h C:\projects\mapserver_cvs\mapserver_patch/maphash.h
--- C:\projects\mapserver_cvs\mapserver/maphash.h	2005-06-14 18:03:33.000000000 +0200
+++ C:\projects\mapserver_cvs\mapserver_patch/maphash.h	2006-02-19 21:43:46.906753600 +0100
@@ -55,21 +55,32 @@
  * Structs
  * ========================================================================= */
 
+#ifndef SWIG
 struct hashObj {
     struct hashObj *next;  /* pointer to next item */
     char           *key;   /* string key that is hashed */
     char           *data;  /* string stored in this item */ 
 };
+#endif /*SWIG*/
 
 typedef struct {
+#ifndef SWIG
     struct hashObj **items;  /* the hash table */
+#endif
+#ifdef SWIG
+%immutable;
+#endif /*SWIG*/
     int              numitems;  /* number of items */
+#ifdef SWIG
+	%mutable;
+#endif /*SWIG*/
 } hashTableObj;
 
 /* =========================================================================
  * Functions
  * ========================================================================= */
 
+#ifndef SWIG
 /* msCreateHashTable - create a hash table
  * ARGS:
  *     None
@@ -141,6 +152,7 @@
  */
 MS_DLL_EXPORT const char *msNextKeyFromHashTable( hashTableObj *table,
                                                   const char *prevkey );
+#endif /*SWIG*/
 
 #ifdef __cplusplus
 }
diff -Naur C:\projects\mapserver_cvs\mapserver/mapprimitive.h C:\projects\mapserver_cvs\mapserver_patch/mapprimitive.h
--- C:\projects\mapserver_cvs\mapserver/mapprimitive.h	2005-06-14 18:03:34.000000000 +0200
+++ C:\projects\mapserver_cvs\mapserver_patch/mapprimitive.h	2006-02-19 21:48:53.066990400 +0100
@@ -55,10 +55,12 @@
   double minx, miny, maxx, maxy;
 } rectObj;
 
+#ifndef SWIG
 typedef struct {
   double x;
   double y;
 } vectorObj;
+#endif /*SWIG*/
 
 typedef struct {
   double x;
diff -Naur C:\projects\mapserver_cvs\mapserver/mapshape.h C:\projects\mapserver_cvs\mapserver_patch/mapshape.h
--- C:\projects\mapserver_cvs\mapserver/mapshape.h	2005-06-14 18:03:34.000000000 +0200
+++ C:\projects\mapserver_cvs\mapserver_patch/mapshape.h	2006-02-19 21:50:08.215048000 +0100
@@ -178,6 +178,7 @@
 #endif
 } shapefileObj;
 
+#ifndef SWIG
 /* layerInfo structure for tiled shapefiles */
 typedef struct { 
   shapefileObj *shpfile;
@@ -185,7 +186,6 @@
   int tilelayerindex;
 } msTiledSHPLayerInfo;
 
-#ifndef SWIG
 
 /* shapefileObj function prototypes  */
 MS_DLL_EXPORT int msSHPOpenFile(shapefileObj *shpfile, char *mode, char *filename);