Index: /trunk/Ohana/src/libfits/Makefile
===================================================================
--- /trunk/Ohana/src/libfits/Makefile	(revision 5237)
+++ /trunk/Ohana/src/libfits/Makefile	(revision 5238)
@@ -2,6 +2,6 @@
 
 include ../../Configure
-HOME	=	.
 
+HOME	=	$(ROOT)/src/libfits
 HEAD	=	$(HOME)/header
 MATR	=	$(HOME)/matrix
@@ -14,19 +14,13 @@
 DESTMAN	=	$(LMAN)
 
-INCS	=	-I$(INC) 
-CFLAGS	=	-o $*.$(ARCH).o $(INCS) -D$(ARCH)
-LFLAGS	=	-c $(INCS)
+CFLAGS	=	-I$(LINC) -D$(ARCH)
 
 default: install
 
-sample: /h/eugene/src/ohana/lib/linux/libFITS.a sample.o
-	gcc -g -o sample sample.o /h/eugene/src/ohana/lib/linux/libFITS.a -lm
+install: $(DESTLIB)/libFITS.a $(DESTMAN)/fits.1
 
-sample2: /h/eugene/src/ohana/lib/linux/libFITS.a sample2.o
-	gcc -g -o sample2 sample2.o /h/eugene/src/ohana/lib/linux/libFITS.a -lm
+libfits: $(LIB)/libFITS.$(ARCH).a
 
-fits: $(DESTLIB)/libFITS.a
-
-install: $(DESTINC)/fitsio.h $(DESTLIB)/libFITS.a $(DESTMAN)/fits.1
+INCS = $(DESTINC)/fitsio.h 
 
 HEADER_OBJ = \
@@ -62,13 +56,7 @@
 # $(TABL)/F_get_T_value.$(ARCH).o
 
-LIBOBJ = $(HEADER_OBJ) $(MATRIX_OBJ) $(TABLE_OBJ)
+OBJS = $(HEADER_OBJ) $(MATRIX_OBJ) $(TABLE_OBJ)
 
-$(LIBOBJ): $(INC)/fits.h $(INC)/fitsio.h
-
-$(LIB)/libFITS.$(ARCH).a: $(LIBOBJ)
-	@if [ ! -d $(LIB) ]; then mkdir -p $(LIB); fi
-	rm -f $(LIB)/libFITS.$(ARCH).a
-	ar rcv $(LIB)/libFITS.$(ARCH).a $(LIBOBJ)
-	$(RANLIB) $(LIB)/libFITS.$(ARCH).a
+$(OBJS): $(INCS)
 
 $(DESTLIB)/libFITS.a: $(LIB)/libFITS.$(ARCH).a 
@@ -77,8 +65,14 @@
 	cp $(LIB)/libFITS.$(ARCH).a $(DESTLIB)/libFITS.a
 
-$(DESTINC)/fitsio.h: $(INC)/fitsio.h
+$(LIB)/libFITS.$(ARCH).a: $(OBJS)
+	@if [ ! -d $(LIB) ]; then mkdir -p $(LIB); fi
+	rm -f $(LIB)/libFITS.$(ARCH).a
+	ar rcv $(LIB)/libFITS.$(ARCH).a $(OBJS)
+	$(RANLIB) $(LIB)/libFITS.$(ARCH).a
+
+$(DESTINC)/%: $(INC)/%
 	@if [ ! -d $(DESTINC) ]; then mkdir -p $(DESTINC); fi
-	rm -f $(DESTINC)/fitsio.h
-	cp $(INC)/fitsio.h $(DESTINC)/
+	rm -f $(DESTINC)/$*
+	cp $(INC)/$* $(DESTINC)/
 
 $(DESTMAN)/fits.1: $(MAN)/fits.1
@@ -93,7 +87,8 @@
 	rm -f */#*
 
+dist: clean
+
 .SUFFIXES: .$(ARCH).o
 
 .c.$(ARCH).o:
-	$(CC) $(CFLAGS) -c $<
-
+	$(CC) $(CFLAGS) -c $*.c -o $@
Index: /trunk/Ohana/src/libfits/doc/ChangeLog.txt
===================================================================
--- /trunk/Ohana/src/libfits/doc/ChangeLog.txt	(revision 5237)
+++ /trunk/Ohana/src/libfits/doc/ChangeLog.txt	(revision 5238)
@@ -1,2 +1,15 @@
+
+2005.10.07
+
+	I was having some memory collision problems, and attempting to
+	use the ohana_allocate functions reminded me that the libFITS
+	functions were not supported under ohana_allocate.  This was
+	unhelpful.  I bit the bullet and split libohana into libohana
+	(base functions only, including ohana_allocate) and libdvo
+	(functions based on the libautocode structures).  Doing this
+	allowed me to make libFITS depend on libohana (including
+	ohana_allocate).  BUT, this forced me to change all LDFLAGS
+	entries in ohana to swap -lohana -lFITS for -lFITS -lohana,
+	and to add include <fitsio.h> in some cases.
 
 libfits-1-3:
Index: /trunk/Ohana/src/libfits/doc/sample.c
===================================================================
--- /trunk/Ohana/src/libfits/doc/sample.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/doc/sample.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fitsio.h"
+# include <ohana.h>
+# include <fitsio.h>
 # define TRUE 1
 
Index: /trunk/Ohana/src/libfits/doc/sample2.c
===================================================================
--- /trunk/Ohana/src/libfits/doc/sample2.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/doc/sample2.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fitsio.h"
+# include <ohana.h>
+# include <fitsio.h>
 # include <stdio.h>
 # define TRUE 1
Index: /trunk/Ohana/src/libfits/header/F_H_field.c
===================================================================
--- /trunk/Ohana/src/libfits/header/F_H_field.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/header/F_H_field.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits header field ****************************/
Index: /trunk/Ohana/src/libfits/header/F_copy_H.c
===================================================================
--- /trunk/Ohana/src/libfits/header/F_copy_H.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/header/F_copy_H.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits copy header ***********************************/
Index: /trunk/Ohana/src/libfits/header/F_create_H.c
===================================================================
--- /trunk/Ohana/src/libfits/header/F_create_H.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/header/F_create_H.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 # define NBYTES 2880
 
Index: /trunk/Ohana/src/libfits/header/F_delete.c
===================================================================
--- /trunk/Ohana/src/libfits/header/F_delete.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/header/F_delete.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits delete ****************************/
Index: /trunk/Ohana/src/libfits/header/F_free_H.c
===================================================================
--- /trunk/Ohana/src/libfits/header/F_free_H.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/header/F_free_H.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits free header ***********************************/
Index: /trunk/Ohana/src/libfits/header/F_init_H.c
===================================================================
--- /trunk/Ohana/src/libfits/header/F_init_H.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/header/F_init_H.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 int FT_UNSIGN_MODE;
 
Index: /trunk/Ohana/src/libfits/header/F_insert_array.c
===================================================================
--- /trunk/Ohana/src/libfits/header/F_insert_array.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/header/F_insert_array.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits insert array ***********************************/
Index: /trunk/Ohana/src/libfits/header/F_modify.c
===================================================================
--- /trunk/Ohana/src/libfits/header/F_modify.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/header/F_modify.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 char *fits_keyword_start (char *line);
Index: /trunk/Ohana/src/libfits/header/F_print.c
===================================================================
--- /trunk/Ohana/src/libfits/header/F_print.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/header/F_print.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 int fits_print (Header *header, char *field, char *mode, int N,...) {
Index: /trunk/Ohana/src/libfits/header/F_read_H.c
===================================================================
--- /trunk/Ohana/src/libfits/header/F_read_H.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/header/F_read_H.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 int FT_UNSIGN_MODE;
 
Index: /trunk/Ohana/src/libfits/header/F_read_XH.c
===================================================================
--- /trunk/Ohana/src/libfits/header/F_read_XH.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/header/F_read_XH.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 int FT_UNSIGN_MODE;
 
Index: /trunk/Ohana/src/libfits/header/F_scan.c
===================================================================
--- /trunk/Ohana/src/libfits/header/F_scan.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/header/F_scan.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 char *fits_keyword_start (char *line);
Index: /trunk/Ohana/src/libfits/header/F_write_H.c
===================================================================
--- /trunk/Ohana/src/libfits/header/F_write_H.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/header/F_write_H.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits write header ***********************************/
Index: /trunk/Ohana/src/libfits/header/version.c
===================================================================
--- /trunk/Ohana/src/libfits/header/version.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/header/version.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 static char *name = "$Name: not supported by cvs2svn $";
 
Index: unk/Ohana/src/libfits/include/fits.h
===================================================================
--- /trunk/Ohana/src/libfits/include/fits.h	(revision 5237)
+++ 	(revision )
@@ -1,86 +1,0 @@
-# include <stdio.h>
-# include <math.h>
-# include <malloc.h>
-# include <string.h>
-# include <stdlib.h>
-
-# include <stdarg.h> 
-# include <fitsio.h>
-
-/*
-# ifndef ANSI
-# include <varargs.h>
-# else
-# include <stdarg.h> 
-# include <cfuncs.h> 
-# endif
-*/
-
-/********************** internal constants ************/
-# ifndef NEWLINE
-# define NEWLINE                 10  /* UNIX RETURN character */
-# endif /* NEWLINE */
-
-# ifndef MAX
-# define MIN(X,Y) ((X) < (Y) ? (X) : (Y))
-# define MAX(X,Y) ((X) > (Y) ? (X) : (Y))
-# endif
-
-/* general macros which should exist anyway! */
-# ifndef ALLOCATE
-# define ALLOCATE(X,T,S)  \
-  X = (T *) malloc ((unsigned)(MAX(((S)*((int)sizeof(T))),1))); \
-  if (X == NULL) { \
-    fprintf(stderr,"failed malloc at %d in %s\n", __LINE__, __FILE__);\
-    exit (10); } 
-# define REALLOCATE(X,T,S) \
-  X = (T *) realloc(X,(unsigned)(MAX(((S)*((int)sizeof(T))),1))); \
-  if (X == NULL) { \
-    fprintf(stderr,"failed realloc at %d in %s\n", __LINE__, __FILE__);\
-    exit (10); }
-# define CHECK_REALLOCATE(X,T,S,N,D) \
-  if ((N) >= (S)) { \
-    S += D; \
-    X = (T *) realloc(X,(unsigned)(MAX(((S)*((int)sizeof(T))),1))); \
-    if (X == NULL) { \
-      fprintf(stderr,"failed realloc increment at %d in %s\n", __LINE__, __FILE__);\
-      exit (10); } }
-# define free(X) \
-  free(X); X = NULL;
-
-# endif /* ALLOCATE */
-
-
-# if (0)
-# define ALLOCATE(X,T,S)  \
-  X=(T *)malloc((unsigned) ((S)*sizeof(T)));\
-  if(X==NULL) \
-    { \
-      fprintf(stderr,"failed to malloc %d entries\n", S);\
-	exit(0);\
-    } 
-# define REALLOCATE(X,T,S) \
-  X=(T *)realloc(X,(unsigned) ((S)*sizeof(T))); \
-  if(X==NULL) \
-    { \
-       fprintf(stderr,"failed to realloc %d entries\n", S); \
-       exit(0); \
-    }
-# endif /* old versions */
-
-# ifndef TRUE
-# define TRUE                           (1)
-# define FALSE                          (0)
-# endif  /* TRUE */
-
-# ifdef linux
-# define BYTE_SWAP
-# endif
-
-# ifdef sid
-# define BYTE_SWAP
-# endif
-
-# ifdef dec
-# define BYTE_SWAP
-# endif
Index: /trunk/Ohana/src/libfits/include/fitsio.h
===================================================================
--- /trunk/Ohana/src/libfits/include/fitsio.h	(revision 5237)
+++ /trunk/Ohana/src/libfits/include/fitsio.h	(revision 5238)
@@ -3,4 +3,24 @@
 # ifndef FITSIO
 # define FITSIO
+
+/* also defined in libautocode/def/common.h */
+/* what about lin64 ?? - 'linux' might be defined automatically by linux */
+# ifndef BYTE_SWAP
+# ifdef linux
+# define BYTE_SWAP
+# endif
+
+# ifdef sid
+# define BYTE_SWAP
+# endif
+
+# ifdef dec
+# define BYTE_SWAP
+# endif
+# endif /* BYTE_SWAP */
+
+# ifndef NEWLINE
+# define NEWLINE                 10  /* UNIX RETURN character */
+# endif /* NEWLINE */
 
 /********** FITS Constants *********/
Index: /trunk/Ohana/src/libfits/matrix/F_add_M.c
===================================================================
--- /trunk/Ohana/src/libfits/matrix/F_add_M.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/matrix/F_add_M.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits insert array ***********************************/
Index: /trunk/Ohana/src/libfits/matrix/F_add_M_value.c
===================================================================
--- /trunk/Ohana/src/libfits/matrix/F_add_M_value.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/matrix/F_add_M_value.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /***************** fits add matrix value ***********************************/
Index: /trunk/Ohana/src/libfits/matrix/F_convert_format.c
===================================================================
--- /trunk/Ohana/src/libfits/matrix/F_convert_format.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/matrix/F_convert_format.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 # define CONVERTDOWN \
Index: /trunk/Ohana/src/libfits/matrix/F_copy_M.c
===================================================================
--- /trunk/Ohana/src/libfits/matrix/F_copy_M.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/matrix/F_copy_M.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits copy header ***********************************/
Index: /trunk/Ohana/src/libfits/matrix/F_create_M.c
===================================================================
--- /trunk/Ohana/src/libfits/matrix/F_create_M.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/matrix/F_create_M.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits create matrix *******************************/
Index: /trunk/Ohana/src/libfits/matrix/F_divide_M.c
===================================================================
--- /trunk/Ohana/src/libfits/matrix/F_divide_M.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/matrix/F_divide_M.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /********************* fits divide matrix ***********************************/
Index: /trunk/Ohana/src/libfits/matrix/F_free_M.c
===================================================================
--- /trunk/Ohana/src/libfits/matrix/F_free_M.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/matrix/F_free_M.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits free matrix ***********************************/
Index: /trunk/Ohana/src/libfits/matrix/F_get_M_value.c
===================================================================
--- /trunk/Ohana/src/libfits/matrix/F_get_M_value.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/matrix/F_get_M_value.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /***************** fits get matrix value ***********************************/
Index: /trunk/Ohana/src/libfits/matrix/F_insert_M.c
===================================================================
--- /trunk/Ohana/src/libfits/matrix/F_insert_M.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/matrix/F_insert_M.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits insert array ***********************************/
Index: /trunk/Ohana/src/libfits/matrix/F_load_M.c
===================================================================
--- /trunk/Ohana/src/libfits/matrix/F_load_M.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/matrix/F_load_M.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 int fits_fread_matrix (FILE *f, Matrix *matrix, Header *header) {
Index: /trunk/Ohana/src/libfits/matrix/F_matrix.c
===================================================================
--- /trunk/Ohana/src/libfits/matrix/F_matrix.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/matrix/F_matrix.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 int fits_matrix_size (Header *header) {
Index: /trunk/Ohana/src/libfits/matrix/F_multiply_M.c
===================================================================
--- /trunk/Ohana/src/libfits/matrix/F_multiply_M.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/matrix/F_multiply_M.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /******************* fits multiply matrix ***********************************/
Index: /trunk/Ohana/src/libfits/matrix/F_read_M.c
===================================================================
--- /trunk/Ohana/src/libfits/matrix/F_read_M.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/matrix/F_read_M.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits read matrix ***********************************/
Index: /trunk/Ohana/src/libfits/matrix/F_read_portion.c
===================================================================
--- /trunk/Ohana/src/libfits/matrix/F_read_portion.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/matrix/F_read_portion.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 # ifndef SEEK_CUR 
 # define SEEK_SET 0   
Index: /trunk/Ohana/src/libfits/matrix/F_read_segment.c
===================================================================
--- /trunk/Ohana/src/libfits/matrix/F_read_segment.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/matrix/F_read_segment.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /** warning: this function requires 'dparse' which is included in libohana.a **/
Index: /trunk/Ohana/src/libfits/matrix/F_set_M_value.c
===================================================================
--- /trunk/Ohana/src/libfits/matrix/F_set_M_value.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/matrix/F_set_M_value.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /****************** fits set matrix value ***********************************/
Index: /trunk/Ohana/src/libfits/matrix/F_write_M.c
===================================================================
--- /trunk/Ohana/src/libfits/matrix/F_write_M.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/matrix/F_write_M.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits write matrix ***********************************/
Index: /trunk/Ohana/src/libfits/table/F_create_T.c
===================================================================
--- /trunk/Ohana/src/libfits/table/F_create_T.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/table/F_create_T.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits create table *******************************/
Index: /trunk/Ohana/src/libfits/table/F_create_TH.c
===================================================================
--- /trunk/Ohana/src/libfits/table/F_create_TH.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/table/F_create_TH.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /* a basic table header (extension) is different from a primary header
Index: /trunk/Ohana/src/libfits/table/F_define_column.c
===================================================================
--- /trunk/Ohana/src/libfits/table/F_define_column.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/table/F_define_column.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /***********************/
Index: /trunk/Ohana/src/libfits/table/F_free_T.c
===================================================================
--- /trunk/Ohana/src/libfits/table/F_free_T.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/table/F_free_T.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 int fits_free_table (FTable *table) {
Index: /trunk/Ohana/src/libfits/table/F_get_T_column.c
===================================================================
--- /trunk/Ohana/src/libfits/table/F_get_T_column.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/table/F_get_T_column.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits get table column *****************************/
Index: /trunk/Ohana/src/libfits/table/F_get_T_value.c
===================================================================
--- /trunk/Ohana/src/libfits/table/F_get_T_value.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/table/F_get_T_value.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits get table value ********************************/
Index: /trunk/Ohana/src/libfits/table/F_get_column.c
===================================================================
--- /trunk/Ohana/src/libfits/table/F_get_column.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/table/F_get_column.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 # define SWAP_BYTE \
   tmp = Pin[0]; Pin[0] = Pin[1]; Pin[1] = tmp;
Index: /trunk/Ohana/src/libfits/table/F_read_T.c
===================================================================
--- /trunk/Ohana/src/libfits/table/F_read_T.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/table/F_read_T.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits read table ***********************************/
Index: /trunk/Ohana/src/libfits/table/F_read_TH.c
===================================================================
--- /trunk/Ohana/src/libfits/table/F_read_TH.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/table/F_read_TH.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits read Theader ***********************************/
Index: /trunk/Ohana/src/libfits/table/F_set_column.c
===================================================================
--- /trunk/Ohana/src/libfits/table/F_set_column.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/table/F_set_column.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 # define SWAP_BYTE \
   tmp = Pout[0]; Pout[0] = Pout[1]; Pout[1] = tmp;
Index: /trunk/Ohana/src/libfits/table/F_table_column.c
===================================================================
--- /trunk/Ohana/src/libfits/table/F_table_column.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/table/F_table_column.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits table column ****************************/
Index: /trunk/Ohana/src/libfits/table/F_table_format.c
===================================================================
--- /trunk/Ohana/src/libfits/table/F_table_format.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/table/F_table_format.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /***********************/
Index: /trunk/Ohana/src/libfits/table/F_table_row.c
===================================================================
--- /trunk/Ohana/src/libfits/table/F_table_row.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/table/F_table_row.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits table column ****************************/
Index: /trunk/Ohana/src/libfits/table/F_write_T.c
===================================================================
--- /trunk/Ohana/src/libfits/table/F_write_T.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/table/F_write_T.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits write header *********************************/
Index: /trunk/Ohana/src/libfits/table/F_write_TH.c
===================================================================
--- /trunk/Ohana/src/libfits/table/F_write_TH.c	(revision 5237)
+++ /trunk/Ohana/src/libfits/table/F_write_TH.c	(revision 5238)
@@ -1,3 +1,4 @@
-# include "fits.h"
+# include <ohana.h>
+# include <fitsio.h>
 
 /*********************** fits write header *********************************/