Index: trunk/Ohana/src/libohana/include/ohana.h
===================================================================
--- trunk/Ohana/src/libohana/include/ohana.h	(revision 3400)
+++ trunk/Ohana/src/libohana/include/ohana.h	(revision 3508)
@@ -25,6 +25,4 @@
 # define OHANA_H
 
-extern double hypot();
-
 # define TRUE (1)
 # define FALSE (0)
@@ -36,4 +34,5 @@
 # define MAX(X,Y) ((X) > (Y) ? (X) : (Y))
 # define SWAP(X,Y) {double tmp=(X); (X) = (Y); (Y) = tmp;}
+# define DTIME(A,B) ((A.tv_sec - B.tv_sec) + 1e-6*(A.tv_usec - B.tv_usec))
 
 # define LCK_UNLOCK  0   /* file is unlocked */
@@ -55,9 +54,6 @@
 # endif
 
-int setlockfile2 (char *filename, double timeout, int type, int *state);
-int clearlockfile2 (char *filename, int fd, int type, int *state);
-
-FILE *fsetlockfile (char *filename, double timeout, int type, int *state);
-int fclearlockfile (char *filename, FILE *f, int type, int *state);
+# define DEG_RAD 57.295779513082322
+# define RAD_DEG  0.017453292519943
 
 # ifndef PROTO
@@ -103,8 +99,5 @@
 # endif /* FOPEN */
 
-# define DEG_RAD 57.295779513082322
-# define RAD_DEG  0.017453292519943
-
-# define DTIME(A,B) ((A.tv_sec - B.tv_sec) + 1e-6*(A.tv_usec - B.tv_usec))
+extern double hypot();
 
 /* in string.c */
@@ -118,21 +111,21 @@
 int   get_argument (int argc, char **argv, char *arg);
 int   remove_argument (int N, int *argc, char **argv);
+void  uppercase (char *string);
 
-int   Fread (void *ptr, int size, int nitems, FILE *f, char *type);
-int   Fwrite (void *ptr, int size, int nitems, FILE *f, char *type);
-int   ByteSwap (char *ptr, int size, int nitems, char *type);
-int   ConvertStruct (char *buffer, int size, int Nbytes, char *type);
-
+/* in findexec.c */
 char *pathname (char *name);
 char *filebasename (char *name);
 char *filerootname (char *name);
 char *findexec (int argc, char **argv);
-int mkdirhier (char *path);
+int   mkdirhier (char *path);
+void  make_backup (char *filename);
 
+/* in glockfile.c */
 FILE *fsetlockfile (char *filename, double timeout, int type, int *state);
-int fclearlockfile (char *filename, FILE *f, int type, int *state);
-int setlockfile2 (char *filename, double timeout, int type, int *state);
-int clearlockfile2 (char *filename, int fd, int type, int *state);
+int   fclearlockfile (char *filename, FILE *f, int type, int *state);
+int   setlockfile2 (char *filename, double timeout, int type, int *state);
+int   clearlockfile2 (char *filename, int fd, int type, int *state);
 
+/* in config.c */
 char *SelectConfigFile (int *argc, char **argv, char *progname);
 char *LoadConfigFile (char *filename);
@@ -141,4 +134,7 @@
 char *fileextname (char *file);
 char *LoadRawConfigFile (char *, int);
+
+/* in Fseek.c */
+int   Fseek (FILE *f, long offset, int whence);
 
 /*