Index: trunk/psLib/swig/Makefile.am
===================================================================
--- trunk/psLib/swig/Makefile.am	(revision 3937)
+++ trunk/psLib/swig/Makefile.am	(revision 4541)
@@ -6,13 +6,4 @@
 
 SRCDIR = $(shell cd $(top_srcdir) && pwd)
-INCLUDES = -I$(SRCDIR)/src \
-	-I$(SRCDIR)/src/astronomy \
-	-I$(SRCDIR)/src/collections \
-	-I$(SRCDIR)/src/dataManip \
-	-I$(SRCDIR)/src/dataIO \
-	-I$(SRCDIR)/src/image \
-	-I$(SRCDIR)/src/sysUtils \
-	-I/usr/include \
-	-I/usr/local/include
 
 ####################################################
@@ -27,5 +18,5 @@
 psLibModule/setup.txt:
 	if [ ! -d psLibModule ]; then mkdir psLibModule; fi
-	echo "includes=$(INCLUDES)" > psLibModule/setup.txt
+	echo "includes=$(SRCINC)" > psLibModule/setup.txt
 	echo "ldflags=-L$(top_builddir)/src $(PSLIB_LIBS)" >> psLibModule/setup.txt
 	echo "cflags=$(CFLAGS) -std=c99 -Wno-unused -Wno-strict-aliasing" >> psLibModule/setup.txt
@@ -33,5 +24,5 @@
 psLibModule/pslib_wrap.c: $(srcdir)/pslib.i
 	if [ ! -d psLibModule ]; then mkdir psLibModule; fi
-	$(SWIG) -perl $(INCLUDES) -w451 -o $@ $(srcdir)/pslib.i
+	$(SWIG) -perl $(SRCINC) -w451 -o $@ $(srcdir)/pslib.i
 
 psLibModule/Makefile:psLibModule/Makefile.PL psLibModule/setup.txt
Index: trunk/psLib/swig/pslib.i
===================================================================
--- trunk/psLib/swig/pslib.i	(revision 3937)
+++ trunk/psLib/swig/pslib.i	(revision 4541)
@@ -2,10 +2,10 @@
 
 %{
-#define PS_ALLOW_MALLOC 
+#define PS_ALLOW_MALLOC
 #define SWIG
 #include "pslib.h"
 
 /* SWIG uses malloc/free - make it use the pslib memory functions instead. */
-/* 
+/*
 #define malloc(S)    psAlloc(S)
 #define realloc(P,S) psRealloc(P,S)
@@ -36,5 +36,5 @@
 #if defined(SWIGPERL)
    if (!SvOK($input)) {
-      $1 = NULL;      
+      $1 = NULL;
    } else {
       $1 = PerlIO_findFILE(IoIFP(sv_2io($input)));
@@ -58,8 +58,12 @@
 
 /* the actual including of headers are found in each of the directories. */
-%include "sysUtils.i"
-%include "image.i"
-%include "dataIO.i"
-%include "dataManip.i"
-%include "collections.i"
-%include "astronomy.i"
+%include "astro.i"
+%include "db.i"
+%include "fft.i"
+%include "fits.i"
+%include "imageops.i"
+%include "math.i"
+%include "mathtypes.i"
+%include "sys.i"
+%include "types.i"
+%include "xml.i"