[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnuastro-commits] master 708090b 4/6: Non-installed headers moved to li
|
From: |
Mohammad Akhlaghi |
|
Subject: |
[gnuastro-commits] master 708090b 4/6: Non-installed headers moved to lib/ |
|
Date: |
Sun, 2 Oct 2016 22:23:45 +0000 (UTC) |
branch: master
commit 708090b10f92ca0de6fd7b0091efb8e3a4e8d56b
Author: Mohammad Akhlaghi <address@hidden>
Commit: Mohammad Akhlaghi <address@hidden>
Non-installed headers moved to lib/
Until now, the non-installed header files were mixed with the installed
ones in `lib/gnuastro/' this made them hard to manage and would also make
the code harder to read for a user: which headers can a user also use in
their own programs and which are internal to Gnuastro?
So the internal headers are now mixed with the library `.c' source files in
`lib/' and `lib/gnuastro/' is only used for those headers that will be
installed.
---
bin/arithmetic/args.h | 5 +++--
bin/arithmetic/arithmetic.c | 3 ++-
bin/arithmetic/main.c | 2 +-
bin/arithmetic/main.h | 3 ++-
bin/arithmetic/ui.c | 14 +++++++-------
bin/convertt/args.h | 4 ++--
bin/convertt/convertt.c | 3 ++-
bin/convertt/eps.c | 4 ++--
bin/convertt/main.c | 2 +-
bin/convertt/main.h | 2 +-
bin/convertt/ui.c | 8 ++++----
bin/convolve/args.h | 4 ++--
bin/convolve/convolve.c | 3 ++-
bin/convolve/main.c | 2 +-
bin/convolve/main.h | 3 ++-
bin/convolve/ui.c | 7 ++++---
bin/cosmiccal/args.h | 5 +++--
bin/cosmiccal/main.c | 2 +-
bin/cosmiccal/main.h | 2 +-
bin/cosmiccal/ui.c | 9 +++++----
bin/header/args.h | 5 +++--
bin/header/main.c | 2 +-
bin/header/main.h | 3 ++-
bin/header/ui.c | 12 ++++++------
bin/imgcrop/args.h | 4 ++--
bin/imgcrop/crop.c | 5 +++--
bin/imgcrop/imgcrop.c | 5 +++--
bin/imgcrop/main.c | 2 +-
bin/imgcrop/main.h | 3 ++-
bin/imgcrop/ui.c | 12 ++++++------
bin/imgstat/args.h | 5 +++--
bin/imgstat/imgstat.c | 3 ++-
bin/imgstat/main.c | 2 +-
bin/imgstat/main.h | 2 +-
bin/imgstat/ui.c | 14 +++++++-------
bin/imgwarp/args.h | 4 ++--
bin/imgwarp/main.c | 2 +-
bin/imgwarp/main.h | 2 +-
bin/imgwarp/ui.c | 9 +++++----
bin/mkcatalog/args.h | 5 +++--
bin/mkcatalog/main.c | 2 +-
bin/mkcatalog/main.h | 3 ++-
bin/mkcatalog/mkcatalog.c | 5 +++--
bin/mkcatalog/ui.c | 12 ++++++------
bin/mkcatalog/upperlimit.c | 3 ++-
bin/mknoise/args.h | 4 ++--
bin/mknoise/main.c | 2 +-
bin/mknoise/main.h | 3 ++-
bin/mknoise/mknoise.c | 5 +++--
bin/mknoise/ui.c | 12 ++++++------
bin/mkprof/args.h | 4 ++--
bin/mkprof/main.c | 2 +-
bin/mkprof/main.h | 3 ++-
bin/mkprof/mkprof.c | 5 +++--
bin/mkprof/oneprofile.c | 5 +++--
bin/mkprof/ui.c | 9 +++++----
bin/noisechisel/args.h | 4 ++--
bin/noisechisel/clumps.c | 7 ++++---
bin/noisechisel/detection.c | 5 +++--
bin/noisechisel/label.c | 3 ++-
bin/noisechisel/main.c | 2 +-
bin/noisechisel/main.h | 3 ++-
bin/noisechisel/noisechisel.c | 3 ++-
bin/noisechisel/segmentation.c | 3 ++-
bin/noisechisel/thresh.c | 5 +++--
bin/noisechisel/ui.c | 12 ++++++------
bin/subtractsky/args.h | 4 ++--
bin/subtractsky/main.c | 2 +-
bin/subtractsky/main.h | 3 ++-
bin/subtractsky/subtractsky.c | 3 ++-
bin/subtractsky/ui.c | 12 ++++++------
bin/table/args.h | 5 +++--
bin/table/main.c | 2 +-
bin/table/main.h | 3 ++-
bin/table/ui.c | 12 ++++++------
doc/Makefile.am | 2 +-
doc/gnuastro.texi | 12 ++++++------
lib/Makefile.am | 17 ++++++++---------
lib/checkset.c | 2 +-
lib/{gnuastro => }/checkset.h | 0
lib/{gnuastro => }/commonargs.h | 6 +++---
lib/{gnuastro => }/commonparams.h | 0
lib/configfiles.c | 4 ++--
lib/{gnuastro => }/configfiles.h | 0
lib/fits.c | 5 +++--
lib/{gnuastro => }/fixedstringmacros.h | 0
lib/gnuastro/README | 8 +++++---
lib/mesh.c | 3 ++-
lib/mode.c | 3 ++-
lib/{gnuastro => }/mode.h | 0
lib/{gnuastro => }/neighbors.h | 0
lib/statistics.c | 2 +-
lib/timing.c | 2 +-
lib/{gnuastro => }/timing.h | 0
94 files changed, 234 insertions(+), 192 deletions(-)
diff --git a/bin/arithmetic/args.h b/bin/arithmetic/args.h
index 64df67b..135732e 100644
--- a/bin/arithmetic/args.h
+++ b/bin/arithmetic/args.h
@@ -25,9 +25,10 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <argp.h>
-#include <gnuastro/commonargs.h>
#include <gnuastro/linkedlist.h>
-#include <gnuastro/fixedstringmacros.h>
+
+#include <commonargs.h>
+#include <fixedstringmacros.h>
diff --git a/bin/arithmetic/arithmetic.c b/bin/arithmetic/arithmetic.c
index 8632eb7..94c750e 100644
--- a/bin/arithmetic/arithmetic.c
+++ b/bin/arithmetic/arithmetic.c
@@ -31,9 +31,10 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gnuastro/fits.h>
#include <gnuastro/array.h>
-#include <gnuastro/checkset.h>
#include <gnuastro/statistics.h>
+#include <checkset.h>
+
#include "main.h"
#include "arithmetic.h" /* needs main.h. */
diff --git a/bin/arithmetic/main.c b/bin/arithmetic/main.c
index b7b86b1..ecb4618 100644
--- a/bin/arithmetic/main.c
+++ b/bin/arithmetic/main.c
@@ -25,7 +25,7 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <stdio.h>
#include <stdlib.h>
-#include <gnuastro/timing.h> /* Includes time.h and sys/time.h */
+#include <timing.h> /* Includes time.h and sys/time.h */
#include "main.h"
diff --git a/bin/arithmetic/main.h b/bin/arithmetic/main.h
index 30430f4..f33a2b0 100644
--- a/bin/arithmetic/main.h
+++ b/bin/arithmetic/main.h
@@ -25,7 +25,8 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gnuastro/fits.h>
#include <gnuastro/linkedlist.h>
-#include <gnuastro/commonparams.h>
+
+#include <commonparams.h>
/* Progarm name macros: */
#define SPACK "astarithmetic" /* Subpackage executable name. */
diff --git a/bin/arithmetic/ui.c b/bin/arithmetic/ui.c
index 74ab080..50ac6e6 100644
--- a/bin/arithmetic/ui.c
+++ b/bin/arithmetic/ui.c
@@ -30,14 +30,14 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <string.h>
#include <fitsio.h>
-#include <nproc.h> /* From Gnulib. */
-
#include <gnuastro/fits.h>
-#include <gnuastro/timing.h> /* Includes time.h and sys/time.h */
-#include <gnuastro/checkset.h>
-#include <gnuastro/commonargs.h>
-#include <gnuastro/configfiles.h>
-#include <gnuastro/fixedstringmacros.h>
+
+#include <nproc.h> /* From Gnulib. */
+#include <timing.h> /* Includes time.h and sys/time.h */
+#include <checkset.h>
+#include <commonargs.h>
+#include <configfiles.h>
+#include <fixedstringmacros.h>
#include "main.h"
diff --git a/bin/convertt/args.h b/bin/convertt/args.h
index 98ec095..71b0e4e 100644
--- a/bin/convertt/args.h
+++ b/bin/convertt/args.h
@@ -23,8 +23,8 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#ifndef ARGS_H
#define ARGS_H
-#include <gnuastro/commonargs.h>
-#include <gnuastro/fixedstringmacros.h>
+#include <commonargs.h>
+#include <fixedstringmacros.h>
#include "ui.h"
diff --git a/bin/convertt/convertt.c b/bin/convertt/convertt.c
index ea065a8..b587ef9 100644
--- a/bin/convertt/convertt.c
+++ b/bin/convertt/convertt.c
@@ -30,10 +30,11 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <stdlib.h>
#include <gnuastro/fits.h>
-#include <gnuastro/timing.h>
#include <gnuastro/txtarray.h>
#include <gnuastro/statistics.h>
+#include <timing.h>
+
#include "main.h"
#include "jpeg.h"
diff --git a/bin/convertt/eps.c b/bin/convertt/eps.c
index 2fb7f22..f0fc02e 100644
--- a/bin/convertt/eps.c
+++ b/bin/convertt/eps.c
@@ -28,8 +28,8 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <stdlib.h>
#include <string.h>
-#include <gnuastro/timing.h>
-#include <gnuastro/checkset.h>
+#include <timing.h>
+#include <checkset.h>
#include "main.h"
diff --git a/bin/convertt/main.c b/bin/convertt/main.c
index e6b25f8..f8f5ae7 100644
--- a/bin/convertt/main.c
+++ b/bin/convertt/main.c
@@ -25,7 +25,7 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <stdio.h>
#include <stdlib.h>
-#include <gnuastro/timing.h> /* Includes time.h and sys/time.h */
+#include <timing.h> /* Includes time.h and sys/time.h */
#include "main.h"
diff --git a/bin/convertt/main.h b/bin/convertt/main.h
index 8e54e6f..313e9df 100644
--- a/bin/convertt/main.h
+++ b/bin/convertt/main.h
@@ -25,7 +25,7 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <stdint.h>
-#include <gnuastro/commonparams.h>
+#include <commonparams.h>
diff --git a/bin/convertt/ui.c b/bin/convertt/ui.c
index 7cfe044..ab62f9f 100644
--- a/bin/convertt/ui.c
+++ b/bin/convertt/ui.c
@@ -30,13 +30,13 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <float.h>
#include <stdlib.h>
-#include <nproc.h> /* From Gnulib. */
-
#include <gnuastro/fits.h>
-#include <gnuastro/timing.h> /* Includes time.h and sys/time.h */
#include <gnuastro/txtarray.h>
#include <gnuastro/linkedlist.h>
-#include <gnuastro/configfiles.h>
+
+#include <nproc.h> /* From Gnulib. */
+#include <timing.h> /* Includes time.h and sys/time.h */
+#include <configfiles.h>
#include "main.h"
diff --git a/bin/convolve/args.h b/bin/convolve/args.h
index da380d2..6e8f335 100644
--- a/bin/convolve/args.h
+++ b/bin/convolve/args.h
@@ -23,8 +23,8 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#ifndef ARGS_H
#define ARGS_H
-#include <gnuastro/commonargs.h>
-#include <gnuastro/fixedstringmacros.h>
+#include <commonargs.h>
+#include <fixedstringmacros.h>
#include "ui.h"
diff --git a/bin/convolve/convolve.c b/bin/convolve/convolve.c
index 020cda8..0125667 100644
--- a/bin/convolve/convolve.c
+++ b/bin/convolve/convolve.c
@@ -30,10 +30,11 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gsl/gsl_errno.h>
#include <gnuastro/fits.h>
-#include <gnuastro/timing.h>
#include <gnuastro/threads.h>
#include <gnuastro/spatialconvolve.h>
+#include <timing.h>
+
#include "main.h"
#include "convolve.h"
diff --git a/bin/convolve/main.c b/bin/convolve/main.c
index a47a177..2316a0e 100644
--- a/bin/convolve/main.c
+++ b/bin/convolve/main.c
@@ -25,7 +25,7 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <stdio.h>
#include <stdlib.h>
-#include <gnuastro/timing.h> /* Includes time.h and sys/time.h */
+#include <timing.h> /* Includes time.h and sys/time.h */
#include "main.h"
diff --git a/bin/convolve/main.h b/bin/convolve/main.h
index 814d61c..7cb25d0 100644
--- a/bin/convolve/main.h
+++ b/bin/convolve/main.h
@@ -27,7 +27,8 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gnuastro/mesh.h>
#include <gnuastro/threads.h>
-#include <gnuastro/commonparams.h>
+
+#include <commonparams.h>
diff --git a/bin/convolve/ui.c b/bin/convolve/ui.c
index a4ab56c..5ea0e90 100644
--- a/bin/convolve/ui.c
+++ b/bin/convolve/ui.c
@@ -33,10 +33,11 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gnuastro/fits.h>
#include <gnuastro/array.h>
-#include <gnuastro/timing.h> /* Includes time.h and sys/time.h */
-#include <gnuastro/checkset.h>
#include <gnuastro/statistics.h>
-#include <gnuastro/configfiles.h>
+
+#include <timing.h> /* Includes time.h and sys/time.h */
+#include <checkset.h>
+#include <configfiles.h>
#include "main.h"
diff --git a/bin/cosmiccal/args.h b/bin/cosmiccal/args.h
index ad926b1..51dc40b 100644
--- a/bin/cosmiccal/args.h
+++ b/bin/cosmiccal/args.h
@@ -25,9 +25,10 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <argp.h>
-#include <gnuastro/commonargs.h>
#include <gnuastro/linkedlist.h>
-#include <gnuastro/fixedstringmacros.h>
+
+#include <commonargs.h>
+#include <fixedstringmacros.h>
diff --git a/bin/cosmiccal/main.c b/bin/cosmiccal/main.c
index 974cc97..eb9f144 100644
--- a/bin/cosmiccal/main.c
+++ b/bin/cosmiccal/main.c
@@ -25,7 +25,7 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <stdio.h>
#include <stdlib.h>
-#include <gnuastro/timing.h> /* Includes time.h and sys/time.h */
+#include <timing.h> /* Includes time.h and sys/time.h */
#include "main.h"
diff --git a/bin/cosmiccal/main.h b/bin/cosmiccal/main.h
index a0058de..61c81f4 100644
--- a/bin/cosmiccal/main.h
+++ b/bin/cosmiccal/main.h
@@ -23,7 +23,7 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#ifndef MAIN_H
#define MAIN_H
-#include <gnuastro/commonparams.h>
+#include <commonparams.h>
/* Progarm name macros: */
#define SPACK "astcosmiccal" /* Subpackage executable name. */
diff --git a/bin/cosmiccal/ui.c b/bin/cosmiccal/ui.c
index bdcf002..98f015e 100644
--- a/bin/cosmiccal/ui.c
+++ b/bin/cosmiccal/ui.c
@@ -34,11 +34,12 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gsl/gsl_const_mksa.h>
#include <gnuastro/fits.h>
-#include <gnuastro/timing.h> /* Includes time.h and sys/time.h */
-#include <gnuastro/checkset.h>
#include <gnuastro/txtarray.h>
-#include <gnuastro/commonargs.h>
-#include <gnuastro/configfiles.h>
+
+#include <timing.h> /* Includes time.h and sys/time.h */
+#include <checkset.h>
+#include <commonargs.h>
+#include <configfiles.h>
#include "main.h"
diff --git a/bin/header/args.h b/bin/header/args.h
index acd0b35..3d96892 100644
--- a/bin/header/args.h
+++ b/bin/header/args.h
@@ -25,9 +25,10 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <argp.h>
-#include <gnuastro/commonargs.h>
#include <gnuastro/linkedlist.h>
-#include <gnuastro/fixedstringmacros.h>
+
+#include <commonargs.h>
+#include <fixedstringmacros.h>
diff --git a/bin/header/main.c b/bin/header/main.c
index 5b084c0..3613b47 100644
--- a/bin/header/main.c
+++ b/bin/header/main.c
@@ -25,7 +25,7 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <stdio.h>
#include <stdlib.h>
-#include <gnuastro/timing.h> /* Includes time.h and sys/time.h */
+#include <timing.h> /* Includes time.h and sys/time.h */
#include "main.h"
diff --git a/bin/header/main.h b/bin/header/main.h
index caa820d..c024a15 100644
--- a/bin/header/main.h
+++ b/bin/header/main.h
@@ -24,7 +24,8 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#define MAIN_H
#include <gnuastro/fits.h>
-#include <gnuastro/commonparams.h>
+
+#include <commonparams.h>
/* Progarm name macros: */
#define SPACK "astheader" /* Subpackage executable name. */
diff --git a/bin/header/ui.c b/bin/header/ui.c
index 96251f2..d0bec79 100644
--- a/bin/header/ui.c
+++ b/bin/header/ui.c
@@ -30,14 +30,14 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <string.h>
#include <fitsio.h>
-#include <nproc.h> /* From Gnulib. */
-
#include <gnuastro/fits.h>
-#include <gnuastro/timing.h> /* Includes time.h and sys/time.h */
-#include <gnuastro/checkset.h>
#include <gnuastro/txtarray.h>
-#include <gnuastro/commonargs.h>
-#include <gnuastro/configfiles.h>
+
+#include <nproc.h> /* From Gnulib. */
+#include <timing.h> /* Includes time.h and sys/time.h */
+#include <checkset.h>
+#include <commonargs.h>
+#include <configfiles.h>
#include "main.h"
diff --git a/bin/imgcrop/args.h b/bin/imgcrop/args.h
index 0a6ea9f..cb670e3 100644
--- a/bin/imgcrop/args.h
+++ b/bin/imgcrop/args.h
@@ -25,8 +25,8 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <argp.h>
-#include <gnuastro/commonargs.h>
-#include <gnuastro/fixedstringmacros.h>
+#include <commonargs.h>
+#include <fixedstringmacros.h>
diff --git a/bin/imgcrop/crop.c b/bin/imgcrop/crop.c
index b09d52e..baaa1d8 100644
--- a/bin/imgcrop/crop.c
+++ b/bin/imgcrop/crop.c
@@ -33,9 +33,10 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gnuastro/box.h>
#include <gnuastro/fits.h>
-#include <gnuastro/timing.h>
#include <gnuastro/polygon.h>
-#include <gnuastro/checkset.h>
+
+#include <timing.h>
+#include <checkset.h>
#include "main.h"
diff --git a/bin/imgcrop/imgcrop.c b/bin/imgcrop/imgcrop.c
index 674ee2c..e0d4c23 100644
--- a/bin/imgcrop/imgcrop.c
+++ b/bin/imgcrop/imgcrop.c
@@ -30,9 +30,10 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <stdlib.h>
#include <gnuastro/fits.h>
-#include <gnuastro/timing.h>
#include <gnuastro/threads.h>
-#include <gnuastro/checkset.h>
+
+#include <timing.h>
+#include <checkset.h>
#include "main.h"
diff --git a/bin/imgcrop/main.c b/bin/imgcrop/main.c
index 2a45bf6..ad3942a 100644
--- a/bin/imgcrop/main.c
+++ b/bin/imgcrop/main.c
@@ -25,7 +25,7 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <stdio.h>
#include <stdlib.h>
-#include <gnuastro/timing.h> /* Includes time.h and sys/time.h */
+#include <timing.h> /* Includes time.h and sys/time.h */
#include "main.h"
diff --git a/bin/imgcrop/main.h b/bin/imgcrop/main.h
index e6c0043..1096bbd 100644
--- a/bin/imgcrop/main.h
+++ b/bin/imgcrop/main.h
@@ -26,7 +26,8 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gnuastro/fits.h>
#include <gnuastro/linkedlist.h>
-#include <gnuastro/commonparams.h>
+
+#include <commonparams.h>
diff --git a/bin/imgcrop/ui.c b/bin/imgcrop/ui.c
index 5144a51..3d2098f 100644
--- a/bin/imgcrop/ui.c
+++ b/bin/imgcrop/ui.c
@@ -29,14 +29,14 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <string.h>
#include <fitsio.h>
-#include <nproc.h> /* From Gnulib. */
-
#include <gnuastro/fits.h>
-#include <gnuastro/timing.h> /* Includes time.h and sys/time.h */
-#include <gnuastro/checkset.h>
#include <gnuastro/txtarray.h>
-#include <gnuastro/commonargs.h>
-#include <gnuastro/configfiles.h>
+
+#include <nproc.h> /* From Gnulib. */
+#include <timing.h> /* Includes time.h and sys/time.h */
+#include <checkset.h>
+#include <commonargs.h>
+#include <configfiles.h>
#include "main.h"
#include "crop.h"
diff --git a/bin/imgstat/args.h b/bin/imgstat/args.h
index 1ba3c1b..48763f6 100644
--- a/bin/imgstat/args.h
+++ b/bin/imgstat/args.h
@@ -25,9 +25,10 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <argp.h>
-#include <gnuastro/commonargs.h>
#include <gnuastro/linkedlist.h>
-#include <gnuastro/fixedstringmacros.h>
+
+#include <commonargs.h>
+#include <fixedstringmacros.h>
diff --git a/bin/imgstat/imgstat.c b/bin/imgstat/imgstat.c
index 8caf171..894be11 100644
--- a/bin/imgstat/imgstat.c
+++ b/bin/imgstat/imgstat.c
@@ -30,9 +30,10 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <string.h>
#include <stdlib.h>
-#include <gnuastro/timing.h>
#include <gnuastro/statistics.h>
+#include <timing.h>
+
#include "main.h"
#include "imgstat.h"
diff --git a/bin/imgstat/main.c b/bin/imgstat/main.c
index ee5def2..9551e92 100644
--- a/bin/imgstat/main.c
+++ b/bin/imgstat/main.c
@@ -25,7 +25,7 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <stdio.h>
#include <stdlib.h>
-#include <gnuastro/timing.h> /* Includes time.h and sys/time.h */
+#include <timing.h> /* Includes time.h and sys/time.h */
#include "main.h"
diff --git a/bin/imgstat/main.h b/bin/imgstat/main.h
index e75fc5d..875afca 100644
--- a/bin/imgstat/main.h
+++ b/bin/imgstat/main.h
@@ -23,7 +23,7 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#ifndef MAIN_H
#define MAIN_H
-#include <gnuastro/commonparams.h>
+#include <commonparams.h>
/* Progarm name macros: */
#define SPACK "astimgstat" /* Subpackage executable name. */
diff --git a/bin/imgstat/ui.c b/bin/imgstat/ui.c
index 3140aa4..5fe7b88 100644
--- a/bin/imgstat/ui.c
+++ b/bin/imgstat/ui.c
@@ -30,18 +30,18 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <string.h>
#include <fitsio.h>
-#include <nproc.h> /* From Gnulib. */
-
#include <gnuastro/fits.h>
#include <gnuastro/qsort.h>
#include <gnuastro/array.h>
-#include <gnuastro/timing.h> /* Includes time.h and sys/time.h */
-#include <gnuastro/checkset.h>
#include <gnuastro/txtarray.h>
#include <gnuastro/statistics.h>
-#include <gnuastro/commonargs.h>
-#include <gnuastro/configfiles.h>
-#include <gnuastro/fixedstringmacros.h>
+
+#include <nproc.h> /* From Gnulib. */
+#include <timing.h> /* Includes time.h and sys/time.h */
+#include <checkset.h>
+#include <commonargs.h>
+#include <configfiles.h>
+#include <fixedstringmacros.h>
#include "main.h"
diff --git a/bin/imgwarp/args.h b/bin/imgwarp/args.h
index bb85382..d56f5f2 100644
--- a/bin/imgwarp/args.h
+++ b/bin/imgwarp/args.h
@@ -25,8 +25,8 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <argp.h>
-#include <gnuastro/commonargs.h>
-#include <gnuastro/fixedstringmacros.h>
+#include <commonargs.h>
+#include <fixedstringmacros.h>
diff --git a/bin/imgwarp/main.c b/bin/imgwarp/main.c
index 8c4b918..be186da 100644
--- a/bin/imgwarp/main.c
+++ b/bin/imgwarp/main.c
@@ -25,7 +25,7 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <stdio.h>
#include <stdlib.h>
-#include <gnuastro/timing.h> /* Includes time.h and sys/time.h */
+#include <timing.h> /* Includes time.h and sys/time.h */
#include "main.h"
#include "ui.h" /* Needs main.h. */
diff --git a/bin/imgwarp/main.h b/bin/imgwarp/main.h
index 95e7e46..631b4e7 100644
--- a/bin/imgwarp/main.h
+++ b/bin/imgwarp/main.h
@@ -25,7 +25,7 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <pthread.h>
-#include <gnuastro/commonparams.h>
+#include <commonparams.h>
diff --git a/bin/imgwarp/ui.c b/bin/imgwarp/ui.c
index 908cab1..71546de 100644
--- a/bin/imgwarp/ui.c
+++ b/bin/imgwarp/ui.c
@@ -32,11 +32,12 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <nproc.h> /* From Gnulib. */
#include <gnuastro/fits.h>
-#include <gnuastro/timing.h> /* Includes time.h and sys/time.h */
-#include <gnuastro/checkset.h>
#include <gnuastro/txtarray.h>
-#include <gnuastro/commonargs.h>
-#include <gnuastro/configfiles.h>
+
+#include <timing.h> /* Includes time.h and sys/time.h */
+#include <checkset.h>
+#include <commonargs.h>
+#include <configfiles.h>
#include "main.h"
diff --git a/bin/mkcatalog/args.h b/bin/mkcatalog/args.h
index 0eb25d1..beebde0 100644
--- a/bin/mkcatalog/args.h
+++ b/bin/mkcatalog/args.h
@@ -25,9 +25,10 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <argp.h>
-#include <gnuastro/commonargs.h>
#include <gnuastro/linkedlist.h>
-#include <gnuastro/fixedstringmacros.h>
+
+#include <commonargs.h>
+#include <fixedstringmacros.h>
diff --git a/bin/mkcatalog/main.c b/bin/mkcatalog/main.c
index 4733b19..345dda9 100644
--- a/bin/mkcatalog/main.c
+++ b/bin/mkcatalog/main.c
@@ -25,7 +25,7 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <stdio.h>
#include <stdlib.h>
-#include <gnuastro/timing.h> /* Includes time.h and sys/time.h */
+#include <timing.h> /* Includes time.h and sys/time.h */
#include "main.h"
diff --git a/bin/mkcatalog/main.h b/bin/mkcatalog/main.h
index 5ce8f30..3656ae8 100644
--- a/bin/mkcatalog/main.h
+++ b/bin/mkcatalog/main.h
@@ -25,7 +25,8 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gsl/gsl_rng.h>
#include <gnuastro/fits.h>
-#include <gnuastro/commonparams.h>
+
+#include <commonparams.h>
/* Progarm name macros: */
#define SPACK "astmkcatalog" /* Subpackage executable name. */
diff --git a/bin/mkcatalog/mkcatalog.c b/bin/mkcatalog/mkcatalog.c
index 88b63eb..63e0a61 100644
--- a/bin/mkcatalog/mkcatalog.c
+++ b/bin/mkcatalog/mkcatalog.c
@@ -32,9 +32,10 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gnuastro/wcs.h>
#include <gnuastro/fits.h>
-#include <gnuastro/timing.h>
#include <gnuastro/txtarray.h>
-#include <gnuastro/neighbors.h>
+
+#include <timing.h>
+#include <neighbors.h>
#include "main.h"
diff --git a/bin/mkcatalog/ui.c b/bin/mkcatalog/ui.c
index 2cd9e1b..1658313 100644
--- a/bin/mkcatalog/ui.c
+++ b/bin/mkcatalog/ui.c
@@ -30,15 +30,15 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <string.h>
#include <fitsio.h>
-#include <nproc.h> /* From Gnulib. */
-
#include <gnuastro/fits.h>
-#include <gnuastro/timing.h> /* Includes time.h and sys/time.h */
-#include <gnuastro/checkset.h>
#include <gnuastro/txtarray.h>
#include <gnuastro/statistics.h>
-#include <gnuastro/commonargs.h>
-#include <gnuastro/configfiles.h>
+
+#include <nproc.h> /* From Gnulib. */
+#include <timing.h> /* Includes time.h and sys/time.h */
+#include <checkset.h>
+#include <commonargs.h>
+#include <configfiles.h>
#include "main.h"
diff --git a/bin/mkcatalog/upperlimit.c b/bin/mkcatalog/upperlimit.c
index 886f577..fa30ff2 100644
--- a/bin/mkcatalog/upperlimit.c
+++ b/bin/mkcatalog/upperlimit.c
@@ -31,12 +31,13 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gsl/gsl_rng.h>
#include <gnuastro/fits.h>
-#include <gnuastro/timing.h>
#include <gnuastro/threads.h>
#include <gnuastro/txtarray.h>
#include <gnuastro/statistics.h>
#include <gsl/gsl_statistics_double.h>
+#include <timing.h>
+
#include "upperlimit.h"
diff --git a/bin/mknoise/args.h b/bin/mknoise/args.h
index c558ba9..795921a 100644
--- a/bin/mknoise/args.h
+++ b/bin/mknoise/args.h
@@ -25,8 +25,8 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <argp.h>
-#include <gnuastro/commonargs.h>
-#include <gnuastro/fixedstringmacros.h>
+#include <commonargs.h>
+#include <fixedstringmacros.h>
diff --git a/bin/mknoise/main.c b/bin/mknoise/main.c
index 32cc155..f3c7f25 100644
--- a/bin/mknoise/main.c
+++ b/bin/mknoise/main.c
@@ -25,7 +25,7 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <stdio.h>
#include <stdlib.h>
-#include <gnuastro/timing.h> /* Includes time.h and sys/time.h */
+#include <timing.h> /* Includes time.h and sys/time.h */
#include "main.h"
diff --git a/bin/mknoise/main.h b/bin/mknoise/main.h
index 52c751d..82df529 100644
--- a/bin/mknoise/main.h
+++ b/bin/mknoise/main.h
@@ -27,7 +27,8 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gsl/gsl_rng.h>
#include <gnuastro/fits.h>
-#include <gnuastro/commonparams.h>
+
+#include <commonparams.h>
/* Progarm name macros: */
#define SPACK "astmknoise" /* Subpackage executable name. */
diff --git a/bin/mknoise/mknoise.c b/bin/mknoise/mknoise.c
index e4109c6..8d1e877 100644
--- a/bin/mknoise/mknoise.c
+++ b/bin/mknoise/mknoise.c
@@ -29,11 +29,12 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <string.h>
#include <stdlib.h>
#include <sys/time.h> /* Generate random seed. */
+
#include <gsl/gsl_rng.h> /* Used in setrandoms. */
+#include <gnuastro/fits.h>
#include <gsl/gsl_randist.h> /* To make noise. */
-#include <gnuastro/timing.h>
-#include <gnuastro/fits.h>
+#include <timing.h>
#include "main.h"
diff --git a/bin/mknoise/ui.c b/bin/mknoise/ui.c
index 309f678..d369bdb 100644
--- a/bin/mknoise/ui.c
+++ b/bin/mknoise/ui.c
@@ -30,14 +30,14 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <string.h>
#include <fitsio.h>
-#include <nproc.h> /* From Gnulib. */
-
#include <gnuastro/fits.h>
-#include <gnuastro/timing.h> /* Includes time.h and sys/time.h */
-#include <gnuastro/checkset.h>
#include <gnuastro/txtarray.h>
-#include <gnuastro/commonargs.h>
-#include <gnuastro/configfiles.h>
+
+#include <nproc.h> /* From Gnulib. */
+#include <timing.h> /* Includes time.h and sys/time.h */
+#include <checkset.h>
+#include <commonargs.h>
+#include <configfiles.h>
#include "main.h"
diff --git a/bin/mkprof/args.h b/bin/mkprof/args.h
index 26d274c..6487291 100644
--- a/bin/mkprof/args.h
+++ b/bin/mkprof/args.h
@@ -23,8 +23,8 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#ifndef ARGS_H
#define ARGS_H
-#include <gnuastro/commonargs.h>
-#include <gnuastro/fixedstringmacros.h>
+#include <commonargs.h>
+#include <fixedstringmacros.h>
diff --git a/bin/mkprof/main.c b/bin/mkprof/main.c
index 15a0aa9..a7aadf1 100644
--- a/bin/mkprof/main.c
+++ b/bin/mkprof/main.c
@@ -25,7 +25,7 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <stdio.h>
#include <stdlib.h>
-#include <gnuastro/timing.h> /* Includes time.h and sys/time.h */
+#include <timing.h> /* Includes time.h and sys/time.h */
#include "main.h"
#include "mkprof.h"
diff --git a/bin/mkprof/main.h b/bin/mkprof/main.h
index c8cb692..73d9ab7 100644
--- a/bin/mkprof/main.h
+++ b/bin/mkprof/main.h
@@ -27,7 +27,8 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gsl/gsl_rng.h>
#include <gnuastro/fits.h>
-#include <gnuastro/commonparams.h>
+
+#include <commonparams.h>
/* Progarm name macros: */
diff --git a/bin/mkprof/mkprof.c b/bin/mkprof/mkprof.c
index 2a1e3cd..a1c9b17 100644
--- a/bin/mkprof/mkprof.c
+++ b/bin/mkprof/mkprof.c
@@ -32,12 +32,13 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gnuastro/box.h>
#include <gnuastro/fits.h>
#include <gnuastro/array.h>
-#include <gnuastro/timing.h>
#include <gnuastro/threads.h>
-#include <gnuastro/checkset.h>
#include <gnuastro/txtarray.h>
#include <gnuastro/statistics.h>
+#include <timing.h>
+#include <checkset.h>
+
#include "main.h"
#include "mkprof.h" /* Needs main.h astrthreads.h */
diff --git a/bin/mkprof/oneprofile.c b/bin/mkprof/oneprofile.c
index 9030ae5..b4ddce5 100644
--- a/bin/mkprof/oneprofile.c
+++ b/bin/mkprof/oneprofile.c
@@ -35,11 +35,12 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gnuastro/fits.h>
#include <gnuastro/array.h>
-#include <gnuastro/timing.h>
-#include <gnuastro/neighbors.h>
#include <gnuastro/statistics.h>
#include <gnuastro/linkedlist.h>
+#include <timing.h>
+#include <neighbors.h>
+
#include "main.h"
#include "mkprof.h" /* Needs main.h and astrthreads.h */
diff --git a/bin/mkprof/ui.c b/bin/mkprof/ui.c
index 3abee05..ccfdb14 100644
--- a/bin/mkprof/ui.c
+++ b/bin/mkprof/ui.c
@@ -35,12 +35,13 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gnuastro/wcs.h>
#include <gnuastro/fits.h>
#include <gnuastro/array.h>
-#include <gnuastro/timing.h> /* Includes time.h and sys/time.h */
-#include <gnuastro/checkset.h>
#include <gnuastro/txtarray.h>
#include <gnuastro/statistics.h>
-#include <gnuastro/commonargs.h>
-#include <gnuastro/configfiles.h>
+
+#include <timing.h> /* Includes time.h and sys/time.h */
+#include <checkset.h>
+#include <commonargs.h>
+#include <configfiles.h>
#include "main.h"
#include "mkprof.h"
diff --git a/bin/noisechisel/args.h b/bin/noisechisel/args.h
index 0f90944..fe59b0d 100644
--- a/bin/noisechisel/args.h
+++ b/bin/noisechisel/args.h
@@ -25,8 +25,8 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <argp.h>
-#include <gnuastro/commonargs.h>
-#include <gnuastro/fixedstringmacros.h>
+#include <commonargs.h>
+#include <fixedstringmacros.h>
diff --git a/bin/noisechisel/clumps.c b/bin/noisechisel/clumps.c
index 024c42a..f9284d0 100644
--- a/bin/noisechisel/clumps.c
+++ b/bin/noisechisel/clumps.c
@@ -32,12 +32,13 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gnuastro/fits.h>
#include <gnuastro/array.h>
#include <gnuastro/qsort.h>
-#include <gnuastro/timing.h>
-#include <gnuastro/checkset.h>
-#include <gnuastro/neighbors.h>
#include <gnuastro/linkedlist.h>
#include <gnuastro/statistics.h>
+#include <timing.h>
+#include <checkset.h>
+#include <neighbors.h>
+
#include "main.h"
#include "clumps.h"
diff --git a/bin/noisechisel/detection.c b/bin/noisechisel/detection.c
index 23ed869..da0d4f8 100644
--- a/bin/noisechisel/detection.c
+++ b/bin/noisechisel/detection.c
@@ -31,11 +31,12 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gnuastro/mesh.h>
#include <gnuastro/array.h>
#include <gnuastro/qsort.h>
-#include <gnuastro/timing.h>
#include <gnuastro/threads.h>
-#include <gnuastro/checkset.h>
#include <gnuastro/statistics.h>
+#include <timing.h>
+#include <checkset.h>
+
#include "main.h"
#include "sky.h"
diff --git a/bin/noisechisel/label.c b/bin/noisechisel/label.c
index 81e560a..1dd88b5 100644
--- a/bin/noisechisel/label.c
+++ b/bin/noisechisel/label.c
@@ -29,9 +29,10 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <stdlib.h>
#include <gnuastro/fits.h>
-#include <gnuastro/neighbors.h>
#include <gnuastro/linkedlist.h>
+#include <neighbors.h>
+
#include "main.h"
#include "label.h"
diff --git a/bin/noisechisel/main.c b/bin/noisechisel/main.c
index a0e8a80..9ce5bf5 100644
--- a/bin/noisechisel/main.c
+++ b/bin/noisechisel/main.c
@@ -25,7 +25,7 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <stdio.h>
#include <stdlib.h>
-#include <gnuastro/timing.h> /* Includes time.h and sys/time.h */
+#include <timing.h> /* Includes time.h and sys/time.h */
#include "main.h"
diff --git a/bin/noisechisel/main.h b/bin/noisechisel/main.h
index 3b58877..134b33f 100644
--- a/bin/noisechisel/main.h
+++ b/bin/noisechisel/main.h
@@ -25,7 +25,8 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gnuastro/mesh.h>
#include <gnuastro/fits.h>
-#include <gnuastro/commonparams.h>
+
+#include <commonparams.h>
/* Progarm name macros: */
#define SPACK "astnoisechisel" /* Subpackage executable name. */
diff --git a/bin/noisechisel/noisechisel.c b/bin/noisechisel/noisechisel.c
index ab34441..9d0afe5 100644
--- a/bin/noisechisel/noisechisel.c
+++ b/bin/noisechisel/noisechisel.c
@@ -30,7 +30,8 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gnuastro/fits.h>
#include <gnuastro/array.h>
-#include <gnuastro/timing.h>
+
+#include <timing.h>
#include "main.h"
diff --git a/bin/noisechisel/segmentation.c b/bin/noisechisel/segmentation.c
index 95157da..48d056a 100644
--- a/bin/noisechisel/segmentation.c
+++ b/bin/noisechisel/segmentation.c
@@ -30,7 +30,8 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gnuastro/fits.h>
#include <gnuastro/qsort.h>
-#include <gnuastro/neighbors.h>
+
+#include <neighbors.h>
#include "main.h"
diff --git a/bin/noisechisel/thresh.c b/bin/noisechisel/thresh.c
index 1441b7f..de4629d 100644
--- a/bin/noisechisel/thresh.c
+++ b/bin/noisechisel/thresh.c
@@ -28,11 +28,12 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <stdlib.h>
#include <gnuastro/qsort.h>
-#include <gnuastro/timing.h>
-#include <gnuastro/checkset.h>
#include <gnuastro/statistics.h>
#include <gnuastro/spatialconvolve.h>
+#include <timing.h>
+#include <checkset.h>
+
#include "main.h"
#include "binary.h"
#include "noisechisel.h"
diff --git a/bin/noisechisel/ui.c b/bin/noisechisel/ui.c
index dd8d052..870809f 100644
--- a/bin/noisechisel/ui.c
+++ b/bin/noisechisel/ui.c
@@ -30,16 +30,16 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <string.h>
#include <fitsio.h>
-#include <nproc.h> /* From Gnulib. */
-
#include <gnuastro/fits.h>
#include <gnuastro/array.h>
-#include <gnuastro/timing.h> /* includes time.h and sys/time.h */
-#include <gnuastro/checkset.h>
#include <gnuastro/txtarray.h>
-#include <gnuastro/commonargs.h>
#include <gnuastro/statistics.h>
-#include <gnuastro/configfiles.h>
+
+#include <nproc.h> /* From Gnulib. */
+#include <timing.h> /* includes time.h and sys/time.h */
+#include <checkset.h>
+#include <commonargs.h>
+#include <configfiles.h>
#include "main.h"
diff --git a/bin/subtractsky/args.h b/bin/subtractsky/args.h
index d072b02..411d647 100644
--- a/bin/subtractsky/args.h
+++ b/bin/subtractsky/args.h
@@ -25,8 +25,8 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <argp.h>
-#include <gnuastro/commonargs.h>
-#include <gnuastro/fixedstringmacros.h>
+#include <commonargs.h>
+#include <fixedstringmacros.h>
diff --git a/bin/subtractsky/main.c b/bin/subtractsky/main.c
index b192dac..f405c7c 100644
--- a/bin/subtractsky/main.c
+++ b/bin/subtractsky/main.c
@@ -25,7 +25,7 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <stdio.h>
#include <stdlib.h>
-#include <gnuastro/timing.h> /* Includes time.h and sys/time.h */
+#include <timing.h> /* Includes time.h and sys/time.h */
#include "main.h"
diff --git a/bin/subtractsky/main.h b/bin/subtractsky/main.h
index 266befa..8205be7 100644
--- a/bin/subtractsky/main.h
+++ b/bin/subtractsky/main.h
@@ -25,7 +25,8 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gnuastro/mesh.h>
#include <gnuastro/fits.h>
-#include <gnuastro/commonparams.h>
+
+#include <commonparams.h>
/* Progarm name macros: */
#define SPACK "astsubtractsky" /* Subpackage executable name. */
diff --git a/bin/subtractsky/subtractsky.c b/bin/subtractsky/subtractsky.c
index 91bb2a5..e903152 100644
--- a/bin/subtractsky/subtractsky.c
+++ b/bin/subtractsky/subtractsky.c
@@ -31,9 +31,10 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gnuastro/mesh.h>
#include <gnuastro/qsort.h>
#include <gnuastro/array.h>
-#include <gnuastro/timing.h>
#include <gnuastro/statistics.h>
+#include <timing.h>
+
#include "main.h"
diff --git a/bin/subtractsky/ui.c b/bin/subtractsky/ui.c
index 6b4aa33..958c1bc 100644
--- a/bin/subtractsky/ui.c
+++ b/bin/subtractsky/ui.c
@@ -30,16 +30,16 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <string.h>
#include <fitsio.h>
-#include <nproc.h> /* From Gnulib. */
-
#include <gnuastro/fits.h>
#include <gnuastro/array.h>
-#include <gnuastro/timing.h> /* Includes time.h and sys/time.h */
-#include <gnuastro/checkset.h>
#include <gnuastro/txtarray.h>
#include <gnuastro/statistics.h>
-#include <gnuastro/commonargs.h>
-#include <gnuastro/configfiles.h>
+
+#include <nproc.h> /* From Gnulib. */
+#include <timing.h> /* Includes time.h and sys/time.h */
+#include <checkset.h>
+#include <commonargs.h>
+#include <configfiles.h>
#include "main.h"
diff --git a/bin/table/args.h b/bin/table/args.h
index ac82696..b4978f6 100644
--- a/bin/table/args.h
+++ b/bin/table/args.h
@@ -25,9 +25,10 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <argp.h>
-#include <gnuastro/commonargs.h>
#include <gnuastro/linkedlist.h>
-#include <gnuastro/fixedstringmacros.h>
+
+#include <commonargs.h>
+#include <fixedstringmacros.h>
diff --git a/bin/table/main.c b/bin/table/main.c
index b021bff..8b34cf3 100644
--- a/bin/table/main.c
+++ b/bin/table/main.c
@@ -25,7 +25,7 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <stdio.h>
#include <stdlib.h>
-#include <gnuastro/timing.h> /* Includes time.h and sys/time.h */
+#include <timing.h> /* Includes time.h and sys/time.h */
#include "main.h"
diff --git a/bin/table/main.h b/bin/table/main.h
index 50f5c80..3cba9bf 100644
--- a/bin/table/main.h
+++ b/bin/table/main.h
@@ -24,7 +24,8 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#define MAIN_H
#include <gnuastro/fits.h>
-#include <gnuastro/commonparams.h>
+
+#include <commonparams.h>
/* Progarm name macros: */
#define SPACK "asttable" /* Subpackage executable name. */
diff --git a/bin/table/ui.c b/bin/table/ui.c
index 2a22504..531da86 100644
--- a/bin/table/ui.c
+++ b/bin/table/ui.c
@@ -31,14 +31,14 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <string.h>
#include <fitsio.h>
-#include <nproc.h> /* From Gnulib. */
-
#include <gnuastro/fits.h>
-#include <gnuastro/timing.h> /* Includes time.h and sys/time.h */
-#include <gnuastro/checkset.h>
#include <gnuastro/txtarray.h>
-#include <gnuastro/commonargs.h>
-#include <gnuastro/configfiles.h>
+
+#include <nproc.h> /* From Gnulib. */
+#include <timing.h> /* Includes time.h and sys/time.h */
+#include <checkset.h>
+#include <commonargs.h>
+#include <configfiles.h>
#include "main.h"
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4832d00..a25ec37 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -97,7 +97,7 @@ endif
# it. Unfortunately as far as I know, pattern rules are not portable in all
# implementations of Make, so we have to list all the utilities manually.
toputildir=$(top_builddir)/bin
-ALLMANSDEP = $(top_srcdir)/lib/gnuastro/commonargs.h
+ALLMANSDEP = $(top_srcdir)/lib/commonargs.h
man/astarithmetic.1: $(top_srcdir)/bin/arithmetic/args.h $(ALLMANSDEP)
$(MAYBE_HELP2MAN) $(toputildir)/arithmetic/astarithmetic
man/astconvertt.1: $(top_srcdir)/bin/convertt/args.h $(ALLMANSDEP)
diff --git a/doc/gnuastro.texi b/doc/gnuastro.texi
index 60743f7..9eb7171 100644
--- a/doc/gnuastro.texi
+++ b/doc/gnuastro.texi
@@ -17567,13 +17567,13 @@ additions/modifications to C library headers.
The C library (or GNU C library) header files, for example
@file{stdio.h} or @file{errno.h}.
@item
-Installed library header files (for example @file{cfitsio.h} or
address@hidden/gsl_rng.h}), and Gnulib-specific headers (for example
address@hidden). Note that the latter are imported with @code{""}, not
address@hidden<>}, for example @code{#include <nproc.h>}.
+Installed library header files, including Gnuastro's installed headers (for
+example @file{cfitsio.h} or @file{gsl/gsl_rng.h}, or
address@hidden/fits.h}).
@item
-Gnuastro common headers and libraries, for example @file{fits.h} or
address@hidden, see @ref{Headers}.
+Gnuastro's internal headers (that are not installed), for example
address@hidden, or Gnulib's headers (which are also not installed)
+like @file{nproc.h}.
@item
For programs, the @file{main.h} file (which is needed by the next group of
headers).
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 27e2eb3..6a8ac99 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -46,16 +46,15 @@ pkginclude_HEADERS = gnuastro/gnuastro.h
$(headersdir)/array.h \
$(headersdir)/threads.h $(headersdir)/wcs.h $(headersdir)/txtarray.h
-# Files to distribute in the tarball. For the headers: these are internal
-# headers and don't need to be installed. Headers are only mentioned within
-# the source files, and if they are not explicitly mentioned somewhere in
-# the Makefile, they will not distributed, so we need to explicitly tell
-# Automake to distribute them here.
+# Files to distribute in the tarball. These are internal headers and don't
+# need to be installed. Headers are only mentioned within the source files,
+# and if they are not explicitly mentioned somewhere in the Makefile, they
+# will not distributed, so we need to explicitly tell Automake to
+# distribute them here.
headersdir=$(top_srcdir)/lib/gnuastro
-EXTRA_DIST = gnuastro.pc.in gnuastro.h.in $(headersdir)/commonargs.h \
- $(headersdir)/commonparams.h $(headersdir)/fixedstringmacros.h \
- $(headersdir)/mode.h $(headersdir)/neighbors.h $(headersdir)/checkset.h \
- $(headersdir)/configfiles.h $(headersdir)/timing.h $(headersdir)/README
+EXTRA_DIST = gnuastro.pc.in gnuastro.h.in checkset.h commonargs.h \
+ commonparams.h configfiles.h fixedstringmacros.h mode.h neighbors.h \
+ timing.h $(headersdir)/README
# Definitions for Gnuastro's the pkg-config file (inspired from GSL's
diff --git a/lib/checkset.c b/lib/checkset.c
index 8c5c2c9..a09df17 100644
--- a/lib/checkset.c
+++ b/lib/checkset.c
@@ -33,7 +33,7 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <fitsio.h>
-#include <gnuastro/checkset.h>
+#include "checkset.h"
#define FIXEDFORFILE "The value of `%s` (given as %s)"
diff --git a/lib/gnuastro/checkset.h b/lib/checkset.h
similarity index 100%
rename from lib/gnuastro/checkset.h
rename to lib/checkset.h
diff --git a/lib/gnuastro/commonargs.h b/lib/commonargs.h
similarity index 98%
rename from lib/gnuastro/commonargs.h
rename to lib/commonargs.h
index 8bc678d..7881e39 100644
--- a/lib/gnuastro/commonargs.h
+++ b/lib/commonargs.h
@@ -29,9 +29,9 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <fitsio.h>
-#include <gnuastro/checkset.h>
-#include <gnuastro/commonparams.h>
-#include <gnuastro/fixedstringmacros.h>
+#include <checkset.h>
+#include <commonparams.h>
+#include <fixedstringmacros.h>
/* These are separate in each package. */
#include "main.h"
diff --git a/lib/gnuastro/commonparams.h b/lib/commonparams.h
similarity index 100%
rename from lib/gnuastro/commonparams.h
rename to lib/commonparams.h
diff --git a/lib/configfiles.c b/lib/configfiles.c
index 8864ca2..b6365cc 100644
--- a/lib/configfiles.c
+++ b/lib/configfiles.c
@@ -32,8 +32,8 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <dirent.h>
#include <sys/stat.h> /* For mkdir permission flags. */
-#include <gnuastro/checkset.h>
-#include <gnuastro/configfiles.h>
+#include "checkset.h"
+#include "configfiles.h"
diff --git a/lib/gnuastro/configfiles.h b/lib/configfiles.h
similarity index 100%
rename from lib/gnuastro/configfiles.h
rename to lib/configfiles.h
diff --git a/lib/fits.c b/lib/fits.c
index 0c1a238..55a82f4 100644
--- a/lib/fits.c
+++ b/lib/fits.c
@@ -31,8 +31,9 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <unistd.h>
#include <gnuastro/fits.h>
-#include <gnuastro/checkset.h>
-#include <gnuastro/fixedstringmacros.h>
+
+#include "checkset.h"
+#include "fixedstringmacros.h"
/*************************************************************
diff --git a/lib/gnuastro/fixedstringmacros.h b/lib/fixedstringmacros.h
similarity index 100%
rename from lib/gnuastro/fixedstringmacros.h
rename to lib/fixedstringmacros.h
diff --git a/lib/gnuastro/README b/lib/gnuastro/README
index 5c8355d..dab1dcf 100644
--- a/lib/gnuastro/README
+++ b/lib/gnuastro/README
@@ -1,12 +1,14 @@
GNU Astronomy Utilities library header files
============================================
-This directory contins Gnuastro's library header files. Once installed, all
-these directories will be installed in the specified
+This directory contins Gnuastro's installed library header files. Once
+installed, these headers will be installed in the specified
'$(prefix)/include/gnuastro' directory (the value of '$(prefix)' can be set
at configure time, see the "Installation directory" of the Gnuastro book
for more).
Inside of Gnuastro, the directory is given the same name to make Gnuastro's
internal code similar to what a user would use in their own programs once
-the header files are installed.
\ No newline at end of file
+the header files are installed. The headers that are not installed are kept
+in the parent directory of this directory mixed with the actual library
+`.c' source files.
\ No newline at end of file
diff --git a/lib/mesh.c b/lib/mesh.c
index 7144654..a8cc0e0 100644
--- a/lib/mesh.c
+++ b/lib/mesh.c
@@ -33,11 +33,12 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gnuastro/fits.h>
#include <gnuastro/mesh.h>
#include <gnuastro/qsort.h>
-#include <gnuastro/neighbors.h>
#include <gnuastro/linkedlist.h>
#include <gnuastro/statistics.h>
#include <gnuastro/spatialconvolve.h>
+#include "neighbors.h"
+
/*
diff --git a/lib/mode.c b/lib/mode.c
index d98b041..86aeeaa 100644
--- a/lib/mode.c
+++ b/lib/mode.c
@@ -29,10 +29,11 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <float.h>
#include <stdlib.h>
-#include <gnuastro/mode.h>
#include <gnuastro/array.h>
#include <gnuastro/statistics.h>
+#include "mode.h"
+
/****************************************************************
***************** Mode plots ********************
diff --git a/lib/gnuastro/mode.h b/lib/mode.h
similarity index 100%
rename from lib/gnuastro/mode.h
rename to lib/mode.h
diff --git a/lib/gnuastro/neighbors.h b/lib/neighbors.h
similarity index 100%
rename from lib/gnuastro/neighbors.h
rename to lib/neighbors.h
diff --git a/lib/statistics.c b/lib/statistics.c
index fff72e9..8737bd7 100644
--- a/lib/statistics.c
+++ b/lib/statistics.c
@@ -34,7 +34,7 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gnuastro/array.h>
#include <gnuastro/statistics.h>
-#include "gnuastro/mode.h"
+#include "mode.h"
diff --git a/lib/timing.c b/lib/timing.c
index 30ed199..2736dc8 100644
--- a/lib/timing.c
+++ b/lib/timing.c
@@ -24,7 +24,7 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <stdio.h>
-#include <gnuastro/timing.h>
+#include "timing.h"
diff --git a/lib/gnuastro/timing.h b/lib/timing.h
similarity index 100%
rename from lib/gnuastro/timing.h
rename to lib/timing.h
- [gnuastro-commits] master updated (958018d -> c074b09), Mohammad Akhlaghi, 2016/10/02
- [gnuastro-commits] master 8644305 5/6: Correctly report conf files checked, Mohammad Akhlaghi, 2016/10/02
- [gnuastro-commits] master c074b09 6/6: Duplicate filename in MakeCatalog's output removed, Mohammad Akhlaghi, 2016/10/02
- [gnuastro-commits] master 008df03 2/6: Minor random small corrections, Mohammad Akhlaghi, 2016/10/02
- [gnuastro-commits] master b9c3d30 1/6: envseed as a conf. option in MakeNoise and MakeProfiles, Mohammad Akhlaghi, 2016/10/02
- [gnuastro-commits] master 708090b 4/6: Non-installed headers moved to lib/,
Mohammad Akhlaghi <=
- [gnuastro-commits] master 3600a5e 3/6: Upper limit magnitude calculation in MakeCatalog, Mohammad Akhlaghi, 2016/10/02