diff --git a/Makefile.am b/Makefile.am
index 1ceccb0..80e3ed3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,8 +31,8 @@ doc_DATA = \
 docdir = ${datadir}/doc/${PACKAGE}
 
 # Extra files to be distributed in the tar file
-#EXTRA_DIST = autogen.sh \
-#             gammalib.pc.in
+EXTRA_DIST = README.md \
+             doc/Doxyfile doc/source
 
 #install-data-local: $(HTML_INSTALL_DATA_TARGETS)
 #uninstall-local: $(HTML_UNINSTALL_DATA_TARGETS)
diff --git a/examples/Makefile.am b/examples/Makefile.am
index f4d8b40..a97573f 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -2,3 +2,6 @@
 
 # Set sub directories
 SUBDIRS = cpp
+
+# Extra files to be distributed in the tar file
+EXTRA_DIST = python
\ No newline at end of file
diff --git a/inst/Makefile.am b/inst/Makefile.am
index 715e22d..8dca2c4 100644
--- a/inst/Makefile.am
+++ b/inst/Makefile.am
@@ -17,3 +17,5 @@ endif
 # Set sub directories
 SUBDIRS = $(INST_MWL) $(INST_CTA) $(INST_LAT) $(INST_COM)
 
+# Extra files to be distributed in the tar file
+EXTRA_DIST = README.md
diff --git a/inst/com/Makefile.am b/inst/com/Makefile.am
index 80c10aa..447cf85 100644
--- a/inst/com/Makefile.am
+++ b/inst/com/Makefile.am
@@ -42,8 +42,13 @@ libcom_la_SOURCES = $(sources)
 libcom_la_LDFLAGS =
 
 # Distribute calibration database files
-EXTRA_DIST     = $(caldb_indx) $(caldb_irfs)
 caldbindxdir   = $(datadir)/caldb/data/cgro/comptel
 caldbindx_DATA = $(caldb_indx)
 caldbirfsdir   = $(datadir)/caldb/data/cgro/comptel/bcf
 caldbirfs_DATA = $(caldb_irfs)
+
+# Extra files to be distributed in the tar file
+EXTRA_DIST = README.md caldb pyext \
+             include/GCOMLib.hpp \
+             src/GCOMSupport.hpp \
+             test/test_COM.hpp test/test_COM.py test/data
diff --git a/inst/cta/Makefile.am b/inst/cta/Makefile.am
index 6252a45..bae5962 100644
--- a/inst/cta/Makefile.am
+++ b/inst/cta/Makefile.am
@@ -134,3 +134,9 @@ caldb_prod2_south2dir    = $(datadir)/caldb/data/cta/prod2/bcf/South_5h
 caldb_prod2_south2_DATA  = caldb/data/cta/prod2/bcf/South_5h/irf_file.fits.gz
 caldb_prod2_south3dir    = $(datadir)/caldb/data/cta/prod2/bcf/South_50h
 caldb_prod2_south3_DATA  = caldb/data/cta/prod2/bcf/South_50h/irf_file.fits.gz
+
+# Extra files to be distributed in the tar file
+EXTRA_DIST = README.md caldb pyext \
+             include/GCTALib.hpp \
+             src/GCTAResponse_helpers.hpp src/GCTASupport.hpp \
+             test/test_CTA.hpp test/test_CTA.py test/caldb test/data
diff --git a/inst/lat/Makefile.am b/inst/lat/Makefile.am
index 357017e..0656664 100644
--- a/inst/lat/Makefile.am
+++ b/inst/lat/Makefile.am
@@ -227,7 +227,6 @@ liblat_la_SOURCES = $(sources)
 liblat_la_LDFLAGS =
 
 # Distribute calibration database files
-EXTRA_DIST      = $(caldb_indx) $(caldb_add) $(caldb_ea) $(caldb_edisp) $(caldb_psf)
 caldbindxdir    = $(datadir)/caldb/data/glast/lat
 caldbindx_DATA  = $(caldb_indx)
 caldbadddir     = $(datadir)/caldb/data/glast/lat/bcf
@@ -238,3 +237,8 @@ caldbedispdir   = $(datadir)/caldb/data/glast/lat/bcf/edisp
 caldbedisp_DATA = $(caldb_edisp)
 caldbpsfdir     = $(datadir)/caldb/data/glast/lat/bcf/psf
 caldbpsf_DATA   = $(caldb_psf)
+
+# Extra files to be distributed in the tar file
+EXTRA_DIST = README.md caldb pyext \
+             include/GLATLib.hpp \
+             test/test_LAT.hpp test/test_LAT.py test/data
diff --git a/inst/mwl/Makefile.am b/inst/mwl/Makefile.am
index b964a77..3ed220d 100644
--- a/inst/mwl/Makefile.am
+++ b/inst/mwl/Makefile.am
@@ -30,3 +30,8 @@ pkginclude_HEADERS = include/GMWLException.hpp \
 noinst_LTLIBRARIES = libmwl.la
 libmwl_la_SOURCES = $(sources)
 libmwl_la_LDFLAGS =
+
+# Extra files to be distributed in the tar file
+EXTRA_DIST = README.md pyext \
+             include/GMWLLib.hpp \
+             test/test_MWL.hpp test/test_MWL.py test/data
diff --git a/pyext/Makefile.am b/pyext/Makefile.am
index f157a36..f98b1c4 100755
--- a/pyext/Makefile.am
+++ b/pyext/Makefile.am
@@ -73,7 +73,6 @@ testdata    = ../test/data/initial_coords.txt \
               ../test/data/file.fits.gz
 
 # Distribute scripts
-EXTRA_DIST       = $(testscripts) $(testdata)
 testscriptsdir   = $(pyexecdir)/gammalib/tests
 testscripts_DATA = $(testscripts)
 testdatadir      = $(pyexecdir)/gammalib/tests/data
@@ -102,10 +101,10 @@ if WITH_INST_CTA
   testdc1cta_DATA   = $(testdc1cta)
 endif
 
-# Sources that are required for the build. All targets in the list will be built
-# before anything. These are honored by 'make all', 'make check' and 'make install'.
-# We use this here to make sure that all these targets are build by swig before we
-# start compiling the Python modules.
+# Sources that are required for the build. All targets in the list will be
+# built before anything. These are honored by 'make all', 'make check' and
+# 'make install'. We use this here to make sure that all these targets are
+# build by swig before we start compiling the Python modules.
 BUILT_SOURCES = gammalib/app_wrap.cpp  gammalib/app.py \
                 gammalib/base_wrap.cpp gammalib/base.py \
                 gammalib/fits_wrap.cpp gammalib/fits.py \
@@ -122,12 +121,16 @@ BUILT_SOURCES = gammalib/app_wrap.cpp  gammalib/app.py \
                 gammalib/vo_wrap.cpp gammalib/vo.py \
                 $(INST_SWIG_TARGETS)
 
+# Extra files to be distributed in the tar file
+EXTRA_DIST = $(wildcard *.i) $(wildcard gammalib/*.i) gammalib/tests \
+             $(BUILT_SOURCES)
+
 # Dependencies. Obtain the list of dependencies by executing ls.
 DEPFILES = $(shell ls gammalib/*.Pi 2> /dev/null)
 include $(DEPFILES)
 
-# Set files to be removed in clean. We remove only the SWIG interface files if SWIG
-# is available to rebuild them. 
+# Set files to be removed in clean. We remove only the SWIG interface files
+# if SWIG is available to rebuild them.
 if HAVE_SWIG
   CLEAN_FILES = $(BUILT_SOURCES)
 endif
diff --git a/src/fits/Makefile.am b/src/fits/Makefile.am
index 2e8aa8e..a51e965 100644
--- a/src/fits/Makefile.am
+++ b/src/fits/Makefile.am
@@ -43,3 +43,6 @@ sources = GFitsHeaderCard.cpp \
 noinst_LTLIBRARIES = libfits.la
 libfits_la_SOURCES = $(sources)
 libfits_la_LDFLAGS =
+
+# Extra files to be distributed in the tar file
+EXTRA_DIST = GFitsCfitsio.hpp
diff --git a/src/linalg/Makefile.am b/src/linalg/Makefile.am
index 9241d63..b7ebfd7 100644
--- a/src/linalg/Makefile.am
+++ b/src/linalg/Makefile.am
@@ -19,3 +19,6 @@ sources = GVector.cpp \
 noinst_LTLIBRARIES = liblinalg.la
 liblinalg_la_SOURCES = $(sources)
 liblinalg_la_LDFLAGS =
+
+# Extra files to be distributed in the tar file
+EXTRA_DIST = GSparseNumeric.hpp GSparseSymbolic.hpp
diff --git a/test/Makefile.am b/test/Makefile.am
index faafb3b..0407a1f 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -103,78 +103,82 @@ TESTS = test_GSupport \
         $(INST_MWL) $(INST_CTA) $(INST_LAT) $(INST_COM) \
         $(TEST_PYTHON_SCRIPT)
 
+# Extra files to be distributed in the tar file
+EXTRA_DIST = data reports testinst \
+             README.md $(wildcard test_*.py)
+
 # Standard test sources and links
-test_GSupport_SOURCES = test_GSupport.cpp
+test_GSupport_SOURCES = test_GSupport.cpp test_GSupport.hpp
 test_GSupport_LDFLAGS = @LDFLAGS@
 test_GSupport_CPPFLAGS = @CPPFLAGS@
 test_GSupport_LDADD = $(top_srcdir)/src/libgamma.la
 #
-test_GVector_SOURCES = test_GVector.cpp
+test_GVector_SOURCES = test_GVector.cpp test_GVector.hpp
 test_GVector_LDFLAGS = @LDFLAGS@
 test_GVector_CPPFLAGS = @CPPFLAGS@
 test_GVector_LDADD = $(top_srcdir)/src/libgamma.la
 #
-test_GMatrix_SOURCES = test_GMatrix.cpp
+test_GMatrix_SOURCES = test_GMatrix.cpp test_GMatrix.hpp
 test_GMatrix_LDFLAGS = @LDFLAGS@
 test_GMatrix_CPPFLAGS = @CPPFLAGS@
 test_GMatrix_LDADD = $(top_srcdir)/src/libgamma.la
 #
-test_GMatrixSparse_SOURCES = test_GMatrixSparse.cpp
+test_GMatrixSparse_SOURCES = test_GMatrixSparse.cpp test_GMatrixSparse.hpp
 test_GMatrixSparse_LDFLAGS = @LDFLAGS@
 test_GMatrixSparse_CPPFLAGS = @CPPFLAGS@
 test_GMatrixSparse_LDADD = $(top_srcdir)/src/libgamma.la
 #
-test_GMatrixSymmetric_SOURCES = test_GMatrixSymmetric.cpp
+test_GMatrixSymmetric_SOURCES = test_GMatrixSymmetric.cpp test_GMatrixSymmetric.hpp
 test_GMatrixSymmetric_LDFLAGS = @LDFLAGS@
 test_GMatrixSymmetric_CPPFLAGS = @CPPFLAGS@
 test_GMatrixSymmetric_LDADD = $(top_srcdir)/src/libgamma.la
 #
-test_GNumerics_SOURCES = test_GNumerics.cpp
+test_GNumerics_SOURCES = test_GNumerics.cpp test_GNumerics.hpp
 test_GNumerics_LDFLAGS = @LDFLAGS@
 test_GNumerics_CPPFLAGS = @CPPFLAGS@
 test_GNumerics_LDADD = $(top_srcdir)/src/libgamma.la
 #
-test_GFits_SOURCES = test_GFits.cpp
+test_GFits_SOURCES = test_GFits.cpp test_GFits.hpp
 test_GFits_LDFLAGS = @LDFLAGS@
 test_GFits_CPPFLAGS = @CPPFLAGS@
 test_GFits_LDADD = $(top_srcdir)/src/libgamma.la
 #
-test_GXml_SOURCES = test_GXml.cpp
+test_GXml_SOURCES = test_GXml.cpp test_GXml.hpp
 test_GXml_LDFLAGS = @LDFLAGS@
 test_GXml_CPPFLAGS = @CPPFLAGS@
 test_GXml_LDADD = $(top_srcdir)/src/libgamma.la
 #
-test_GVO_SOURCES = test_GVO.cpp
+test_GVO_SOURCES = test_GVO.cpp test_GVO.hpp
 test_GVO_LDFLAGS = @LDFLAGS@
 test_GVO_CPPFLAGS = @CPPFLAGS@
 test_GVO_LDADD = $(top_srcdir)/src/libgamma.la
 #
-test_GXspec_SOURCES = test_GXspec.cpp
+test_GXspec_SOURCES = test_GXspec.cpp test_GXspec.hpp
 test_GXspec_LDFLAGS = @LDFLAGS@
 test_GXspec_CPPFLAGS = @CPPFLAGS@
 test_GXspec_LDADD = $(top_srcdir)/src/libgamma.la
 #
-test_GApplication_SOURCES = test_GApplication.cpp
+test_GApplication_SOURCES = test_GApplication.cpp test_GApplication.hpp
 test_GApplication_LDFLAGS = @LDFLAGS@
 test_GApplication_CPPFLAGS = @CPPFLAGS@
 test_GApplication_LDADD = $(top_srcdir)/src/libgamma.la
 #
-test_GModel_SOURCES = test_GModel.cpp
+test_GModel_SOURCES = test_GModel.cpp test_GModel.hpp
 test_GModel_LDFLAGS = @LDFLAGS@
 test_GModel_CPPFLAGS = @CPPFLAGS@
 test_GModel_LDADD = $(top_srcdir)/src/libgamma.la
 #
-test_GSky_SOURCES = test_GSky.cpp
+test_GSky_SOURCES = test_GSky.cpp test_GSky.hpp
 test_GSky_LDFLAGS = @LDFLAGS@
 test_GSky_CPPFLAGS = @CPPFLAGS@
 test_GSky_LDADD = $(top_srcdir)/src/libgamma.la
 #
-test_GOptimizer_SOURCES = test_GOptimizer.cpp
+test_GOptimizer_SOURCES = test_GOptimizer.cpp test_GOptimizer.hpp
 test_GOptimizer_LDFLAGS = @LDFLAGS@
 test_GOptimizer_CPPFLAGS = @CPPFLAGS@
 test_GOptimizer_LDADD = $(top_srcdir)/src/libgamma.la
 #
-test_GObservation_SOURCES = test_GObservation.cpp
+test_GObservation_SOURCES = test_GObservation.cpp test_GObservation.hpp
 test_GObservation_LDFLAGS = @LDFLAGS@
 test_GObservation_CPPFLAGS = @CPPFLAGS@
 test_GObservation_LDADD = $(top_srcdir)/src/libgamma.la