Description: upstream -- system wide includes
 Make #include's headers system wide rather than local and gather them in a package
 include folder (except the dummy header named according to the package) in order to
 improve portability, to avoid name collisions and to allow out-of-the-box building;
 meant to be submitted to the upstream maintainer team.
Origin: debian
Forwarded: no-more-maintained-by-upstream
Author: Jerome Benoit <calculus@rezozer.net>
Last-Update: 2015-05-18

--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -9,10 +9,22 @@
 
 include Makefile.def
 
-include_HEADERS = $(MYLIBHEADERS) $(PROBDISTHEADERS) $(TESTU01HEADERS) gdefconf.h
+pkginclude_HEADERS = $(MYLIBHEADERS) $(PROBDISTHEADERS) $(TESTU01HEADERS) gdefconf.h
 
 noinst_HEADERS = $(MYLIBTEX) $(PROBDISTTEX) $(TESTU01TEX)
 noinst_SCRIPTS = makedef
 
+header-links: remove-links $(pkginclude_HEADERS)
+	$(MKDIR_P) testu01
+	for h in $(pkginclude_HEADERS) ; do test -e testu01/$$h || $(LN_S) ../$$h testu01/$$h ; done
+
+remove-links:
+	[ ! -d testu01 ] || rm -f testu01/*.h
+
+all-local: header-links
+
+clean-local: remove-links
+	[ ! -d testu01 ] || rmdir testu01 || true
+
 CLEANFILES = $(MYLIBHEADERS) $(PROBDISTHEADERS) $(TESTU01HEADERS) gdefconf.h
 MAINTAINERCLEANFILES = Makefile.in Makefile.def
--- a/testu01/TestU01.h
+++ b/testu01/TestU01.h
@@ -1,62 +1,62 @@
 #ifndef TESTU01_H
 #define TESTU01_H
 
-#include "bbattery.h"
-#include "fcho.h"
-#include "fcong.h"
-#include "ffam.h"
-#include "ffsr.h"
-#include "fknuth.h"
-#include "fmarsa.h"
-#include "fmultin.h"
-#include "fnpair.h"
-#include "fres.h"
-#include "fspectral.h"
-#include "fstring.h"
-#include "ftab.h"
-#include "fvaria.h"
-#include "fwalk.h"
-#include "scatter.h"
-#include "scomp.h"
-#include "sentrop.h"
-#include "sknuth.h"
-#include "smarsa.h"
-#include "smultin.h"
-#include "snpair.h"
-#include "sres.h"
-#include "sspacings.h"
-#include "sspectral.h"
-#include "sstring.h"
-#include "svaria.h"
-#include "swalk.h"
-#include "swrite.h"
-#include "uautomata.h"
-#include "ubrent.h"
-#include "ucarry.h"
-#include "ucrypto.h"
-#include "rijndael-alg-fst.h"
-#include "tu01_sha1.h"
-#include "ucubic.h"
-#include "udeng.h"
-#include "ufile.h"
-#include "ugfsr.h"
-#include "ugranger.h"
-#include "uinv.h"
-#include "uknuth.h"
-#include "ulcg.h"
-#include "ulec.h"
-#include "umarsa.h"
-#include "umrg.h"
-#include "unif01.h"
-#include "unumrec.h"
-#include "uquad.h"
-#include "usoft.h"
-#include "utaus.h"
-#include "utezuka.h"
-#include "utouzin.h"
-#include "uvaria.h"
-#include "uweyl.h"
-#include "uwu.h"
-#include "uxorshift.h"
+#include <testu01/bbattery.h>
+#include <testu01/fcho.h>
+#include <testu01/fcong.h>
+#include <testu01/ffam.h>
+#include <testu01/ffsr.h>
+#include <testu01/fknuth.h>
+#include <testu01/fmarsa.h>
+#include <testu01/fmultin.h>
+#include <testu01/fnpair.h>
+#include <testu01/fres.h>
+#include <testu01/fspectral.h>
+#include <testu01/fstring.h>
+#include <testu01/ftab.h>
+#include <testu01/fvaria.h>
+#include <testu01/fwalk.h>
+#include <testu01/scatter.h>
+#include <testu01/scomp.h>
+#include <testu01/sentrop.h>
+#include <testu01/sknuth.h>
+#include <testu01/smarsa.h>
+#include <testu01/smultin.h>
+#include <testu01/snpair.h>
+#include <testu01/sres.h>
+#include <testu01/sspacings.h>
+#include <testu01/sspectral.h>
+#include <testu01/sstring.h>
+#include <testu01/svaria.h>
+#include <testu01/swalk.h>
+#include <testu01/swrite.h>
+#include <testu01/uautomata.h>
+#include <testu01/ubrent.h>
+#include <testu01/ucarry.h>
+#include <testu01/ucrypto.h>
+#include <testu01/rijndael-alg-fst.h>
+#include <testu01/tu01_sha1.h>
+#include <testu01/ucubic.h>
+#include <testu01/udeng.h>
+#include <testu01/ufile.h>
+#include <testu01/ugfsr.h>
+#include <testu01/ugranger.h>
+#include <testu01/uinv.h>
+#include <testu01/uknuth.h>
+#include <testu01/ulcg.h>
+#include <testu01/ulec.h>
+#include <testu01/umarsa.h>
+#include <testu01/umrg.h>
+#include <testu01/unif01.h>
+#include <testu01/unumrec.h>
+#include <testu01/uquad.h>
+#include <testu01/usoft.h>
+#include <testu01/utaus.h>
+#include <testu01/utezuka.h>
+#include <testu01/utouzin.h>
+#include <testu01/uvaria.h>
+#include <testu01/uweyl.h>
+#include <testu01/uwu.h>
+#include <testu01/uxorshift.h>
 
 #endif
--- a/testu01/bbattery.tex
+++ b/testu01/bbattery.tex
@@ -42,7 +42,7 @@
 #ifndef BBATTERY_H
 #define BBATTERY_H
 \endhide
-#include "unif01.h"
+#include <testu01/unif01.h>
 
 
 extern int bbattery_NTests;
--- a/testu01/fcong.tex
+++ b/testu01/fcong.tex
@@ -41,7 +41,7 @@
 #ifndef FCONG_H
 #define FCONG_H
 \endhide
-#include "ffam.h"
+#include <testu01/ffam.h>
 \endcode
 
 
--- a/testu01/ffam.tex
+++ b/testu01/ffam.tex
@@ -34,7 +34,7 @@
 #ifndef FFAM_H
 #define FFAM_H
 \endhide
-#include "unif01.h"
+#include <testu01/unif01.h>
 \endcode
 
 
--- a/testu01/ffsr.tex
+++ b/testu01/ffsr.tex
@@ -17,7 +17,7 @@
 #ifndef FFSR_H
 #define FFSR_H
 \endhide
-#include "ffam.h"
+#include <testu01/ffam.h>
 \endcode
 
 
--- a/testu01/fknuth.tex
+++ b/testu01/fknuth.tex
@@ -13,10 +13,10 @@
 #ifndef FKNUTH_H
 #define FKNUTH_H
 \endhide
-#include "gdef.h"
-#include "ffam.h"
-#include "fres.h"
-#include "fcho.h"
+#include <testu01/gdef.h>
+#include <testu01/ffam.h>
+#include <testu01/fres.h>
+#include <testu01/fcho.h>
 
 
 extern long fknuth_Maxn;
--- a/testu01/fmarsa.tex
+++ b/testu01/fmarsa.tex
@@ -10,9 +10,9 @@
 #ifndef FMARSA_H
 #define FMARSA_H
 \endhide
-#include "ffam.h"
-#include "fres.h"
-#include "fcho.h"
+#include <testu01/ffam.h>
+#include <testu01/fres.h>
+#include <testu01/fcho.h>
 
 
 extern long fmarsa_Maxn, fmarsa_MaxL;
--- a/testu01/fmultin.tex
+++ b/testu01/fmultin.tex
@@ -23,12 +23,12 @@
 #ifndef FMULTIN_H
 #define FMULTIN_H
 \endhide
-#include "gdef.h"
-#include "ftab.h"
-#include "ffam.h"
-#include "fres.h"
-#include "fcho.h"
-#include "smultin.h"
+#include <testu01/gdef.h>
+#include <testu01/ftab.h>
+#include <testu01/ffam.h>
+#include <testu01/fres.h>
+#include <testu01/fcho.h>
+#include <testu01/smultin.h>
 
 
 extern long fmultin_Maxn;
--- a/testu01/fnpair.tex
+++ b/testu01/fnpair.tex
@@ -10,11 +10,11 @@
 #ifndef FNPAIR_H
 #define FNPAIR_H
 \endhide
-#include "gdef.h"
-#include "ffam.h"
-#include "fres.h"
-#include "fcho.h"
-#include "snpair.h"
+#include <testu01/gdef.h>
+#include <testu01/ffam.h>
+#include <testu01/fres.h>
+#include <testu01/fcho.h>
+#include <testu01/snpair.h>
 
 
 extern long fnpair_Maxn;
--- a/testu01/fres.tex
+++ b/testu01/fres.tex
@@ -28,10 +28,10 @@
 #ifndef FRES_H
 #define FRES_H
 \endhide
-#include "gofw.h"
-#include "ftab.h"
-#include "ffam.h"
-#include "bitset.h"
+#include <testu01/gofw.h>
+#include <testu01/ftab.h>
+#include <testu01/ffam.h>
+#include <testu01/bitset.h>
 \endcode
 
 
--- a/testu01/fspectral.tex
+++ b/testu01/fspectral.tex
@@ -10,9 +10,9 @@
 #ifndef FSPECTRAL_H
 #define FSPECTRAL_H
 \endhide
-#include "ffam.h"
-#include "fres.h"
-#include "fcho.h"
+#include <testu01/ffam.h>
+#include <testu01/fres.h>
+#include <testu01/fcho.h>
 
 
 extern long fspectral_MaxN;
--- a/testu01/fstring.tex
+++ b/testu01/fstring.tex
@@ -11,9 +11,9 @@
 #ifndef FSTRING_H
 #define FSTRING_H
 \endhide
-#include "ffam.h"
-#include "fres.h"
-#include "fcho.h"
+#include <testu01/ffam.h>
+#include <testu01/fres.h>
+#include <testu01/fcho.h>
 
 
 extern long fstring_Maxn, fstring_MaxL;
--- a/testu01/ftab.tex
+++ b/testu01/ftab.tex
@@ -20,8 +20,8 @@
 #ifndef FTAB_H
 #define FTAB_H
 \endhide
-#include "ffam.h"
-#include "unif01.h"
+#include <testu01/ffam.h>
+#include <testu01/unif01.h>
 \endcode
 \code
 \hide
--- a/testu01/fvaria.tex
+++ b/testu01/fvaria.tex
@@ -10,9 +10,9 @@
 #ifndef FVARIA_H
 #define FVARIA_H
 \endhide
-#include "ffam.h"
-#include "fres.h"
-#include "fcho.h"
+#include <testu01/ffam.h>
+#include <testu01/fres.h>
+#include <testu01/fcho.h>
 
 
 extern long fvaria_MaxN;
--- a/testu01/fwalk.tex
+++ b/testu01/fwalk.tex
@@ -10,9 +10,9 @@
 #ifndef FWALK_H
 #define FWALK_H
 \endhide
-#include "ffam.h"
-#include "fres.h"
-#include "fcho.h"
+#include <testu01/ffam.h>
+#include <testu01/fres.h>
+#include <testu01/fcho.h>
 
 
 extern long fwalk_Maxn;
--- a/testu01/rijndael-alg-fst.tex
+++ b/testu01/rijndael-alg-fst.tex
@@ -33,7 +33,7 @@
  */
 #ifndef __RIJNDAEL_ALG_FST_H
 #define __RIJNDAEL_ALG_FST_H
-#include "gdef.h"
+#include <testu01/gdef.h>
 
 
 int rijndaelKeySetupEnc(uint32_t rk[/*4*(Nr + 1)*/], const uint8_t cipherKey[], int keyBits);
--- a/testu01/scatter.tex
+++ b/testu01/scatter.tex
@@ -205,8 +205,8 @@
 #ifndef SCATTER_H
 #define SCATTER_H
 \endhide
-#include "gdef.h"
-#include "unif01.h"
+#include <testu01/gdef.h>
+#include <testu01/unif01.h>
 \endcode
 
 
--- a/testu01/scomp.tex
+++ b/testu01/scomp.tex
@@ -23,8 +23,8 @@
 #ifndef SCOMP_H
 #define SCOMP_H
 \endhide
-#include "unif01.h"
-#include "sres.h"
+#include <testu01/unif01.h>
+#include <testu01/sres.h>
 \endcode
 
 \ifdetailed  %%%%%%%%%%%%%%%
--- a/testu01/sentrop.tex
+++ b/testu01/sentrop.tex
@@ -16,10 +16,10 @@
 #ifndef SENTROP_H
 #define SENTROP_H
 \endhide
-#include "statcoll.h"
-#include "gofw.h"
-#include "unif01.h"
-#include "sres.h"
+#include <testu01/statcoll.h>
+#include <testu01/gofw.h>
+#include <testu01/unif01.h>
+#include <testu01/sres.h>
 \endcode
 
 
--- a/testu01/sknuth.tex
+++ b/testu01/sknuth.tex
@@ -17,9 +17,9 @@
 #ifndef SKNUTH_H
 #define SKNUTH_H
 \endhide
-#include "gdef.h"
-#include "unif01.h"
-#include "sres.h"
+#include <testu01/gdef.h>
+#include <testu01/unif01.h>
+#include <testu01/sres.h>
 \endcode
 
 
--- a/testu01/smarsa.tex
+++ b/testu01/smarsa.tex
@@ -26,8 +26,8 @@
 #ifndef SMARSA_H
 #define SMARSA_H
 \endhide
-#include "unif01.h"
-#include "sres.h"
+#include <testu01/unif01.h>
+#include <testu01/sres.h>
 \endcode
 
 \ifdetailed  %%%%%%%%%%%
--- a/testu01/smultin.tex
+++ b/testu01/smultin.tex
@@ -437,11 +437,11 @@
 #ifndef SMULTIN_H
 #define SMULTIN_H
 \endhide
-#include "gdef.h"
-#include "fmass.h"
-#include "statcoll.h"
-#include "gofw.h"
-#include "unif01.h"
+#include <testu01/gdef.h>
+#include <testu01/fmass.h>
+#include <testu01/statcoll.h>
+#include <testu01/gofw.h>
+#include <testu01/unif01.h>
 
 
 #define smultin_MAX_DELTA  8
--- a/testu01/snpair.tex
+++ b/testu01/snpair.tex
@@ -117,10 +117,10 @@
 #ifndef SNPAIR_H
 #define SNPAIR_H
 \endhide
-#include "gdef.h"
-#include "chrono.h"
-#include "statcoll.h"
-#include "unif01.h"
+#include <testu01/gdef.h>
+#include <testu01/chrono.h>
+#include <testu01/statcoll.h>
+#include <testu01/unif01.h>
 \endcode
 
 
--- a/testu01/sres.tex
+++ b/testu01/sres.tex
@@ -31,8 +31,8 @@
 #ifndef SRES_H
 #define SRES_H
 \endhide
-#include "gofw.h"
-#include "statcoll.h"
+#include <testu01/gofw.h>
+#include <testu01/statcoll.h>
 \endcode
 
 
--- a/testu01/sspacings.tex
+++ b/testu01/sspacings.tex
@@ -45,8 +45,8 @@
 #ifndef SSPACINGS_H
 #define SSPACINGS_H
 \endhide
-#include "unif01.h"
-#include "sres.h"
+#include <testu01/unif01.h>
+#include <testu01/sres.h>
 \endcode
 
 \ifdetailed   %%%%%%%
--- a/testu01/sspectral.tex
+++ b/testu01/sspectral.tex
@@ -17,10 +17,10 @@
 #ifndef SSPEC_H
 #define SSPEC_H
 \endhide
-#include "statcoll.h"
-#include "gofw.h"
-#include "unif01.h"
-#include "sres.h"
+#include <testu01/statcoll.h>
+#include <testu01/gofw.h>
+#include <testu01/unif01.h>
+#include <testu01/sres.h>
 \endcode
 
 \ifdetailed %%%%%%%%%%%%
--- a/testu01/sstring.tex
+++ b/testu01/sstring.tex
@@ -13,9 +13,9 @@
 #ifndef SSTRING_H
 #define SSTRING_H
 \endhide
-#include "tables.h" 
-#include "unif01.h"
-#include "sres.h"
+#include <testu01/tables.h>
+#include <testu01/unif01.h>
+#include <testu01/sres.h>
 \endcode
 \ifdetailed  %%%%%%%%%%%%%%%%%%%%
 
--- a/testu01/svaria.tex
+++ b/testu01/svaria.tex
@@ -11,8 +11,8 @@
 #ifndef SVARIA_H
 #define SVARIA_H
 \endhide
-#include "unif01.h"
-#include "sres.h"
+#include <testu01/unif01.h>
+#include <testu01/sres.h>
 \endcode
 
 \ifdetailed  %%%%%%%%%%%%%%%%%%%%
--- a/testu01/swalk.tex
+++ b/testu01/swalk.tex
@@ -30,9 +30,9 @@
 #ifndef SWALK_H
 #define SWALK_H
 \endhide
-#include "bitset.h"
-#include "unif01.h"
-#include "sres.h"
+#include <testu01/bitset.h>
+#include <testu01/unif01.h>
+#include <testu01/sres.h>
 \endcode
 
 
--- a/testu01/swrite.tex
+++ b/testu01/swrite.tex
@@ -22,10 +22,10 @@
 #ifndef SWRITE_H
 #define SWRITE_H
 \endhide
-#include "gdef.h"
-#include "chrono.h"
-#include "unif01.h"
-#include "sres.h"
+#include <testu01/gdef.h>
+#include <testu01/chrono.h>
+#include <testu01/unif01.h>
+#include <testu01/sres.h>
 \endcode
 
 
--- a/testu01/tu01_sha1.tex
+++ b/testu01/tu01_sha1.tex
@@ -1,7 +1,7 @@
 \code
 #ifndef TU01_SHA1_H
 #define TU01_SHA1_H
-#include "gdef.h"
+#include <testu01/gdef.h>
 
 
 typedef struct
--- a/testu01/uautomata.tex
+++ b/testu01/uautomata.tex
@@ -40,7 +40,7 @@
 #ifndef UAUTOMAT_H
 #define UAUTOMAT_H
 \endhide
-#include "unif01.h"
+#include <testu01/unif01.h>
 
 unif01_Gen * uautomata_CreateCA1 (int N, int S[ ], int r, int F[ ],
                                   int k, int ts, int cs, int rot);
--- a/testu01/ubrent.tex
+++ b/testu01/ubrent.tex
@@ -14,8 +14,8 @@
 #ifndef UBRENT_H
 #define UBRENT_H
 \endhide
-#include "gdef.h"
-#include "unif01.h"
+#include <testu01/gdef.h>
+#include <testu01/unif01.h>
 \endcode
 
 \guisec{The xorgens generators, version 2004}
--- a/testu01/ucarry.tex
+++ b/testu01/ucarry.tex
@@ -21,8 +21,8 @@
 #ifndef UCARRY_H
 #define UCARRY_H
 \endhide
-#include "gdef.h"
-#include "unif01.h"
+#include <testu01/gdef.h>
+#include <testu01/unif01.h>
 
 
 unif01_Gen * ucarry_CreateAWC (unsigned int r, unsigned int s,
--- a/testu01/ucrypto.tex
+++ b/testu01/ucrypto.tex
@@ -26,7 +26,7 @@
 #ifndef UCRYPTO_H
 #define UCRYPTO_H
 \endhide
-#include "unif01.h"
+#include <testu01/unif01.h>
 
 
 typedef enum {
--- a/testu01/ucubic.tex
+++ b/testu01/ucubic.tex
@@ -22,7 +22,7 @@
 #ifndef UCUBIC_H
 #define UCUBIC_H
 \endhide
-#include "unif01.h"
+#include <testu01/unif01.h>
 
 
 unif01_Gen * ucubic_CreateCubic (long m, long a, long b, long c, long d,
--- a/testu01/udeng.tex
+++ b/testu01/udeng.tex
@@ -14,7 +14,7 @@
 #ifndef UDENG_H
 #define UDENG_H
 \endhide
-#include "unif01.h"
+#include <testu01/unif01.h>
 \endcode
 \code
 
--- a/testu01/ufile.tex
+++ b/testu01/ufile.tex
@@ -13,7 +13,7 @@
 #ifndef UFILE_H
 #define UFILE_H
 \endhide
-#include "unif01.h"
+#include <testu01/unif01.h>
 
 
 unif01_Gen * ufile_CreateReadText (char *fname, long nbuf);
--- a/testu01/ugfsr.tex
+++ b/testu01/ugfsr.tex
@@ -41,7 +41,7 @@
 #ifndef UGFSR_H
 #define UGFSR_H
 \endhide
-#include "unif01.h"
+#include <testu01/unif01.h>
 \endcode
 
 %%%%%%%%%%%%%%%%%%%%%%%%
--- a/testu01/ugranger.tex
+++ b/testu01/ugranger.tex
@@ -16,8 +16,8 @@
 #define UGRANGER_H
 /* ugranger.h for ANSI C */
 \endhide
-#include "gdef.h"
-#include "unif01.h"
+#include <testu01/gdef.h>
+#include <testu01/unif01.h>
 
 
 unif01_Gen * ugranger_CreateCombLCGInvExpl (
--- a/testu01/uinv.tex
+++ b/testu01/uinv.tex
@@ -11,7 +11,7 @@
 #ifndef UINV_H
 #define UINV_H
 \endhide
-#include "unif01.h"
+#include <testu01/unif01.h>
 
 
 unif01_Gen * uinv_CreateInvImpl (long m, long a1, long a2, long z0);
--- a/testu01/uknuth.tex
+++ b/testu01/uknuth.tex
@@ -22,7 +22,7 @@
 #ifndef UKNUTH_H
 #define UKNUTH_H
 \endhide
-#include "unif01.h"
+#include <testu01/unif01.h>
 
 
 unif01_Gen * uknuth_CreateRan_array1 (long s, long A[100]);
--- a/testu01/ulcg.tex
+++ b/testu01/ulcg.tex
@@ -73,8 +73,8 @@
 #ifndef ULCG_H
 #define ULCG_H
 \endhide
-#include "gdef.h"
-#include "unif01.h"
+#include <testu01/gdef.h>
+#include <testu01/unif01.h>
 \endcode
 
 %%%%%%%%%%%%%%%%%%%%
--- a/testu01/ulec.tex
+++ b/testu01/ulec.tex
@@ -13,8 +13,8 @@
 #ifndef ULEC_H
 #define ULEC_H
 \endhide
-#include "gdef.h"
-#include "unif01.h"
+#include <testu01/gdef.h>
+#include <testu01/unif01.h>
 
 
 unif01_Gen * ulec_CreateCombLec88 (long S1, long S2);
--- a/testu01/umarsa.tex
+++ b/testu01/umarsa.tex
@@ -20,8 +20,8 @@
 #ifndef UMARSA_H
 #define UMARSA_H
 \endhide
-#include "gdef.h"
-#include "unif01.h"
+#include <testu01/gdef.h>
+#include <testu01/unif01.h>
 
 
 unif01_Gen * umarsa_CreateMarsa90a (int y1, int y2, int y3, int z0,
--- a/testu01/umrg.tex
+++ b/testu01/umrg.tex
@@ -30,8 +30,8 @@
 #ifndef UMRG_H
 #define UMRG_H
 \endhide
-#include "gdef.h"
-#include "unif01.h"
+#include <testu01/gdef.h>
+#include <testu01/unif01.h>
 \endcode
 
 
--- a/testu01/unif01.tex
+++ b/testu01/unif01.tex
@@ -52,7 +52,7 @@
 #ifndef UNIF01_H
 #define UNIF01_H
 \endhide
-#include "gdef.h"
+#include <testu01/gdef.h>
 \endcode
 
 
--- a/testu01/unumrec.tex
+++ b/testu01/unumrec.tex
@@ -16,7 +16,7 @@
 #ifndef UNUMREC_H
 #define UNUMREC_H
 \endhide
-#include "unif01.h"
+#include <testu01/unif01.h>
 
 
 unif01_Gen * unumrec_CreateRan0 (long s);
--- a/testu01/uquad.tex
+++ b/testu01/uquad.tex
@@ -19,7 +19,7 @@
 #ifndef UQUAD_H
 #define UQUAD_H
 \endhide
-#include "unif01.h"
+#include <testu01/unif01.h>
 
 
 unif01_Gen * uquad_CreateQuadratic (long m, long a, long b, long c, long s);
--- a/testu01/usoft.tex
+++ b/testu01/usoft.tex
@@ -15,8 +15,8 @@
 #ifndef USOFT_H
 #define USOFT_H
 \endhide
-#include "gdef.h"
-#include "unif01.h"
+#include <testu01/gdef.h>
+#include <testu01/unif01.h>
 
 
 unif01_Gen * usoft_CreateSPlus (long S1, long S2);
--- a/testu01/utaus.tex
+++ b/testu01/utaus.tex
@@ -38,8 +38,8 @@
 #ifndef UTAUS_H
 #define UTAUS_H
 \endhide
-#include "gdef.h"
-#include "unif01.h"
+#include <testu01/gdef.h>
+#include <testu01/unif01.h>
 
 
 unif01_Gen * utaus_CreateTaus (unsigned int k, unsigned int q,
--- a/testu01/utezuka.tex
+++ b/testu01/utezuka.tex
@@ -12,7 +12,7 @@
 #ifndef UTEZUKA_H
 #define UTEZUKA_H
 \endhide
-#include "unif01.h"
+#include <testu01/unif01.h>
 
 
 unif01_Gen * utezuka_CreateTezLec91 (unsigned int Y1, unsigned int Y2);
--- a/testu01/utouzin.tex
+++ b/testu01/utouzin.tex
@@ -13,7 +13,7 @@
 #ifndef UTOUZIN_H
 #define UTOUZIN_H
 \endhide
-#include "unif01.h"
+#include <testu01/unif01.h>
 
 
 unif01_Gen * utouzin_CreateMRG00a (long s1, long s2, long s3, long s4,
--- a/testu01/uvaria.tex
+++ b/testu01/uvaria.tex
@@ -13,7 +13,7 @@
 #ifndef UVARIA_H
 #define UVARIA_H
 \endhide
-#include "unif01.h"
+#include <testu01/unif01.h>
 
 
 unif01_Gen * uvaria_CreateACORN (int k, double S[]);
--- a/testu01/uweyl.tex
+++ b/testu01/uweyl.tex
@@ -14,7 +14,7 @@
 #define UWEYL_H
 /* uweyl.h for ANSI C */
 \endhide
-#include "unif01.h"
+#include <testu01/unif01.h>
 
 
 unif01_Gen * uweyl_CreateWeyl (double alpha, long n0);
--- a/testu01/uwu.tex
+++ b/testu01/uwu.tex
@@ -13,8 +13,8 @@
 #ifndef UWU_H
 #define UWU_H
 \endhide
-#include "gdef.h"
-#include "unif01.h"
+#include <testu01/gdef.h>
+#include <testu01/unif01.h>
 
 
 #ifdef USE_LONGLONG
--- a/testu01/uxorshift.tex
+++ b/testu01/uxorshift.tex
@@ -49,8 +49,8 @@
 #ifndef UXORSHIFT_H
 #define UXORSHIFT_H
 \endhide
-#include "gdef.h"
-#include "unif01.h"
+#include <testu01/gdef.h>
+#include <testu01/unif01.h>
 
 
 unif01_Gen* uxorshift_CreateXorshift32 (int a, int b, int c, unsigned int x);
--- a/testu01/vectorsF2.tex
+++ b/testu01/vectorsF2.tex
@@ -8,7 +8,7 @@
 #ifndef VECTORSF2_H
 #define VECTORSF2_H
 \endhide
-#include "gdef.h"
+#include <testu01/gdef.h>
 \endcode
 \code
 
--- a/probdist/fbar.tex
+++ b/probdist/fbar.tex
@@ -22,8 +22,8 @@
 #ifndef FBAR_H
 #define FBAR_H
 \endhide
-#include "gdef.h"
-#include "fmass.h"
+#include <testu01/gdef.h>
+#include <testu01/fmass.h>
 \endcode
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--- a/probdist/fdist.tex
+++ b/probdist/fdist.tex
@@ -37,8 +37,8 @@
 #ifndef FDIST_H
 #define FDIST_H
 \endhide
-#include "gdef.h"
-#include "fmass.h"
+#include <testu01/gdef.h>
+#include <testu01/fmass.h>
 \endcode
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--- a/probdist/finv.tex
+++ b/probdist/finv.tex
@@ -22,10 +22,10 @@
 #ifndef FINV_H
 #define FINV_H
 \endhide
-#include "gdef.h"     /* From the library mylib */
-#include "fmass.h"
-#include "fdist.h"
-#include "wdist.h"
+#include <testu01/gdef.h>     /* From the library mylib */
+#include <testu01/fmass.h>
+#include <testu01/fdist.h>
+#include <testu01/wdist.h>
 \endcode
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--- a/probdist/gofs.tex
+++ b/probdist/gofs.tex
@@ -27,10 +27,10 @@
 #ifndef GOFS_H
 #define GOFS_H
 \endhide
-#include "bitset.h"       /* From the library mylib */
-#include "fmass.h"
-#include "fdist.h"
-#include "wdist.h"
+#include <testu01/bitset.h>       /* From the library mylib */
+#include <testu01/fmass.h>
+#include <testu01/fdist.h>
+#include <testu01/wdist.h>
 \endcode
 
 
--- a/probdist/gofw.tex
+++ b/probdist/gofw.tex
@@ -29,10 +29,10 @@
 #ifndef GOFW_H
 #define GOFW_H
 \endhide
-#include "gdef.h"           /* From the library mylib */
-#include "bitset.h"         /* From the library mylib */
-#include "fdist.h"
-#include "wdist.h"
+#include <testu01/gdef.h>           /* From the library mylib */
+#include <testu01/bitset.h>         /* From the library mylib */
+#include <testu01/fdist.h>
+#include <testu01/wdist.h>
 #include <stdio.h>
 \endcode
 
--- a/probdist/wdist.tex
+++ b/probdist/wdist.tex
@@ -18,7 +18,7 @@
 #ifndef WDIST_H
 #define WDIST_H
 \endhide
-#include "fmass.h"
+#include <testu01/fmass.h>
 \endcode
 
 
--- a/mylib/addstr.tex
+++ b/mylib/addstr.tex
@@ -36,7 +36,7 @@
 #ifndef ADDSTR_H
 #define ADDSTR_H
 \endhide
-#include "gdef.h"
+#include <testu01/gdef.h>
 \endcode
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--- a/mylib/bitset.tex
+++ b/mylib/bitset.tex
@@ -7,7 +7,7 @@
 /* bitset.h  for ANSI C */
 #ifndef BITSET_H
 #define BITSET_H
-#include "gdef.h"
+#include <testu01/gdef.h>
 \endhide\endcode
 
 
--- a/mylib/chrono.tex
+++ b/mylib/chrono.tex
@@ -63,7 +63,7 @@
 
 #ifndef CHRONO_H
 #define CHRONO_H 
-#include "gdef.h"
+#include <testu01/gdef.h>
 \fi
 \endcode
 
--- a/mylib/num.tex
+++ b/mylib/num.tex
@@ -10,7 +10,7 @@
 #ifndef NUM_H
 #define NUM_H
 \endhide
-#include "gdef.h"
+#include <testu01/gdef.h>
 \endcode
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--- a/mylib/num2.tex
+++ b/mylib/num2.tex
@@ -12,7 +12,7 @@
 #ifndef NUM2_H
 #define NUM2_H
 \endhide
-#include "gdef.h"
+#include <testu01/gdef.h>
 #include <math.h>
 \endcode
 
--- a/mylib/tables.tex
+++ b/mylib/tables.tex
@@ -29,7 +29,7 @@
 #ifndef TABLES_H
 #define TABLES_H
 \endhide
-#include "gdef.h"
+#include <testu01/gdef.h>
 \endcode
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--- a/mylib/util.tex
+++ b/mylib/util.tex
@@ -12,7 +12,7 @@
 #ifndef UTIL_H
 #define UTIL_H
 \endhide
-#include "gdef.h"
+#include <testu01/gdef.h>
 #include <stdio.h>
 #include <stdlib.h>
 \endcode
--- a/examples/bat1.c
+++ b/examples/bat1.c
@@ -1,6 +1,6 @@
-#include "ulcg.h"
-#include "unif01.h"
-#include "bbattery.h"
+#include <testu01/ulcg.h>
+#include <testu01/unif01.h>
+#include <testu01/bbattery.h>
 
 int main (void)
 {
--- a/examples/bat2.c
+++ b/examples/bat2.c
@@ -1,6 +1,6 @@
-#include "gdef.h"
-#include "swrite.h"
-#include "bbattery.h"
+#include <testu01/gdef.h>
+#include <testu01/swrite.h>
+#include <testu01/bbattery.h>
 
 int main (void)
 {
--- a/examples/bat3.c
+++ b/examples/bat3.c
@@ -1,6 +1,6 @@
-#include "usoft.h"
-#include "unif01.h"
-#include "bbattery.h"
+#include <testu01/usoft.h>
+#include <testu01/unif01.h>
+#include <testu01/bbattery.h>
 
 int main (void)
 {
--- a/examples/birth1.c
+++ b/examples/birth1.c
@@ -1,7 +1,7 @@
 
-#include "unif01.h"
-#include "ulcg.h"
-#include "smarsa.h"
+#include <testu01/unif01.h>
+#include <testu01/ulcg.h>
+#include <testu01/smarsa.h>
 #include <stddef.h>
 
 int main (void)
--- a/examples/birth2.c
+++ b/examples/birth2.c
@@ -1,9 +1,9 @@
 
-#include "unif01.h"
-#include "ulcg.h"
-#include "sres.h"
-#include "swrite.h"
-#include "smarsa.h"
+#include <testu01/unif01.h>
+#include <testu01/ulcg.h>
+#include <testu01/sres.h>
+#include <testu01/swrite.h>
+#include <testu01/smarsa.h>
 
 int main (void)
 {
--- a/examples/ex1.c
+++ b/examples/ex1.c
@@ -1,7 +1,7 @@
 
-#include "unif01.h"
-#include "ulcg.h"
-#include "ulec.h"
+#include <testu01/unif01.h>
+#include <testu01/ulcg.h>
+#include <testu01/ulec.h>
 #include <stdio.h>
 
 int main (void) 
--- a/examples/ex3.c
+++ b/examples/ex3.c
@@ -1,11 +1,10 @@
-
-#include "unif01.h"
-#include "ulcg.h"
-#include "ulec.h"
+#include <testu01/unif01.h>
+#include <testu01/ulcg.h>
+#include <testu01/ulec.h>
 #include "my16807.h"
 #include <stdio.h>
 
-int main (void) 
+int main (void)
 {
    unif01_Gen *gen;
    double x = 0.0;
--- a/examples/ex4.c
+++ b/examples/ex4.c
@@ -1,6 +1,6 @@
 
-#include "unif01.h"
-#include "utaus.h"
+#include <testu01/unif01.h>
+#include <testu01/utaus.h>
 #include <stdio.h>
 
 int main (void)
--- a/examples/ex7.c
+++ b/examples/ex7.c
@@ -1,6 +1,6 @@
 
-#include "unif01.h"
-#include "bbattery.h"
+#include <testu01/unif01.h>
+#include <testu01/bbattery.h>
 
 unsigned int xorshift (void);
 double MRG32k3a (void);
--- a/examples/fbirth.c
+++ b/examples/fbirth.c
@@ -1,7 +1,7 @@
-#include "fcong.h"
-#include "ffam.h"
-#include "fcho.h"
-#include "fmarsa.h"
+#include <testu01/fcong.h>
+#include <testu01/ffam.h>
+#include <testu01/fcho.h>
+#include <testu01/fmarsa.h>
 
 int main (void)
 {
--- a/examples/fcoll.c
+++ b/examples/fcoll.c
@@ -1,8 +1,8 @@
-#include "fcong.h"
-#include "ffam.h"
-#include "fcho.h"
-#include "fmultin.h"
-#include "smultin.h"
+#include <testu01/fcong.h>
+#include <testu01/ffam.h>
+#include <testu01/fcho.h>
+#include <testu01/fmultin.h>
+#include <testu01/smultin.h>
 
 int main (void)
 {
--- a/examples/my16807.c
+++ b/examples/my16807.c
@@ -1,7 +1,7 @@
 #include "my16807.h"
-#include "unif01.h"
-#include "util.h"
-#include "addstr.h"
+#include <testu01/unif01.h>
+#include <testu01/util.h>
+#include <testu01/addstr.h>
 #include <string.h>
 
 typedef struct { double S; } My16807_state;
--- a/examples/my16807.h
+++ b/examples/my16807.h
@@ -1,4 +1,4 @@
-#include "unif01.h"
+#include <testu01/unif01.h>
 
 unif01_Gen *CreateMy16807 (int s);
 
--- a/examples/scat.c
+++ b/examples/scat.c
@@ -1,8 +1,8 @@
-#include "unif01.h"
-#include "ufile.h"
-#include "scatter.h"
+#include <testu01/unif01.h>
+#include <testu01/ufile.h>
+#include <testu01/scatter.h>
 
-int main (void) 
+int main (void)
 {
    unif01_Gen *gen;
    gen = ufile_CreateReadText ("excel.pts", 100000);
--- a/examples/scat2.c
+++ b/examples/scat2.c
@@ -1,6 +1,6 @@
-#include "unif01.h"
-#include "usoft.h"
-#include "scatter.h"
+#include <testu01/unif01.h>
+#include <testu01/usoft.h>
+#include <testu01/scatter.h>
 
 int Proj[] = { 1, 3 };
 long LacI[] = { 1, 2, 6};
--- a/mylib/gdef.tex
+++ b/mylib/gdef.tex
@@ -23,7 +23,7 @@
 #ifndef GDEF_H
 #define GDEF_H
 
-#include <gdefconf.h>
+#include <testu01/gdefconf.h>
 #include <limits.h>
 
 #ifdef HAVE_LONG_LONG