rename src/ as spot/ and use include <spot/...>

* NEWS: Mention the change.
* src/: Rename as ...
* spot/: ... this, adjust all headers to include <spot/...> instead of
"...", and adjust all Makefile.am to search headers from the top-level
directory.
* HACKING: Add conventions about #include.
* spot/sanity/style.test: Add a few more grep to catch cases
that do not follow these conventions.
* .gitignore, Makefile.am, README, bench/stutter/Makefile.am,
bench/stutter/stutter_invariance_formulas.cc,
bench/stutter/stutter_invariance_randomgraph.cc, configure.ac,
debian/rules, doc/Doxyfile.in, doc/Makefile.am,
doc/org/.dir-locals.el.in, doc/org/g++wrap.in, doc/org/init.el.in,
doc/org/tut01.org, doc/org/tut02.org, doc/org/tut03.org,
doc/org/tut10.org, doc/org/tut20.org, doc/org/tut21.org,
doc/org/tut22.org, doc/org/tut30.org, iface/ltsmin/Makefile.am,
iface/ltsmin/kripke.test, iface/ltsmin/ltsmin.cc,
iface/ltsmin/ltsmin.hh, iface/ltsmin/modelcheck.cc,
wrap/python/Makefile.am, wrap/python/ajax/spotcgi.in,
wrap/python/spot_impl.i, wrap/python/tests/ltl2tgba.py,
wrap/python/tests/randgen.py, wrap/python/tests/run.in: Adjust.

.gitignore

@@ -48,7 +48,7 @@ cachegrind.*
 ltdl
 config.h
 config.h.in
-src/src/misc/_config.h
+spot/misc/_config.h
 _configs.sed
 stamp-h1
 *.trs
@@ -78,4 +78,3 @@ GTAGS
 *.deb
 *.changes
 *.dsc
-

HACKING

@@ -283,6 +283,26 @@ Encoding
     In emacs the simplest way to convert the file is to add a comment
     with -*- coding: utf-8 -*- at the top or bottom of the file.
 
+Includes
+--------
+
+  * Use #include with angle-brackets to refer to public headers
+    of Spot; i.e., those that will be installed, or system
+    headers that are already installed.  E.g.,
+
+    #include <spot/misc/version.hh>
+    #include <iostream>
+
+  * Use #include with double quotes to refer to private headers.
+    Those can be from Spot, or from third-party libraries that
+    we ship.  E.g.,
+
+    #include "utf8/utf8.hh"
+    #include "spot/priv/trim.hh"
+    #include "config.h"
+
+    This style of #include should never occur in public headers.
+
 Exporting symbols
 -----------------
 

Makefile.am

@@ -28,7 +28,7 @@ if NEVER
   NEVER_SUBDIRS = bench elisp
 endif
 
-SUBDIRS = buddy lib src wrap ltdl iface doc $(NEVER_SUBDIRS)
+SUBDIRS = buddy lib spot wrap ltdl iface doc $(NEVER_SUBDIRS)
 
 UTF8 = utf8/doc/ReleaseNotes utf8/doc/utf8cpp.html utf8/utf8.h	\
   utf8/utf8/checked.h utf8/utf8/core.h utf8/utf8/unchecked.h

NEWS

@@ -4,6 +4,22 @@ New in spot 1.99.6a (not yet released)
 
   Library:
 
+  * Installed headers now assume that they will be included as
+    #include <spot/subdir/header.hh>
+    instead of
+    #include <subdir/header.hh>
+
+    This implies that when Spot headers are installed in
+    /usr/include/spot/... (the default when using the Debian packages)
+    or /usr/local/include/spot/... (the default when compiling from
+    source), then it is no longuer necessary to add
+    -I/usr/include/spot or -I/usr/local/include/spot when compiling.
+
+    Inside the source distribution, the subdirectory src/ has been
+    renamed to spot/, so that the root of the source tree can also be
+    put on the preprocessor's search path to compile against a
+    non-installed version of Spot.
+
   Python:
 
   Bug fixes:

README

@@ -122,7 +122,7 @@ Some documentation can be found in the doc/ directory.
   logic operators supported by Spot
 
 "make install" will install man pages for command-line tools.  (These
-man pages can also be found in the src/bin/man/ subdirectory of the
+man pages can also be found in the spot/bin/man/ subdirectory of the
 source tree.)  Additional documentation about these tools can be found
 in doc/userdoc/, or on-line at http://spot.lrde.lip6.fr/tools.html
 
@@ -134,7 +134,7 @@ Layout of the source tree
 Core directories
 ----------------
 
-src/              Sources for libspot.
+spot/             Sources for libspot.
    bin/           User tools built using the Spot library.
       man/        Man pages for the above tools.
    graph/         Graph representations.

bench/stutter/Makefile.am

@@ -17,12 +17,12 @@
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(BUDDY_CPPFLAGS) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) $(BUDDY_CPPFLAGS) \
               -I$(top_builddir)/lib -I$(top_srcdir)/lib
 AM_CXXFLAGS = $(WARNING_CXXFLAGS)
 
-LDADD = $(top_builddir)/src/bin/libcommon.a ../../lib/libgnu.la	\
-        ../../src/libspot.la
+LDADD = $(top_builddir)/spot/bin/libcommon.a ../../lib/libgnu.la	\
+        ../../spot/libspot.la
 
 bin_PROGRAMS = stutter_invariance_randomgraph \
 	       stutter_invariance_formulas

bench/stutter/stutter_invariance_formulas.cc

@@ -17,15 +17,15 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "bin/common_sys.hh"
-#include "bin/common_setup.hh"
-#include "bin/common_finput.hh"
-#include "bin/common_output.hh"
-#include "twaalgos/translate.hh"
-#include "twaalgos/stutter.hh"
-#include "twaalgos/stats.hh"
-#include "tl/apcollect.hh"
-#include "misc/timer.hh"
+#include "spot/bin/common_sys.hh"
+#include "spot/bin/common_setup.hh"
+#include "spot/bin/common_finput.hh"
+#include "spot/bin/common_output.hh"
+#include <spot/twaalgos/translate.hh>
+#include <spot/twaalgos/stutter.hh>
+#include <spot/twaalgos/stats.hh>
+#include <spot/tl/apcollect.hh>
+#include <spot/misc/timer.hh>
 #include <argp.h>
 
 const char argp_program_doc[] ="";

bench/stutter/stutter_invariance_randomgraph.cc

@@ -17,18 +17,18 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "misc/timer.hh"
-#include "tl/apcollect.hh"
-#include "twaalgos/complement.hh"
-#include "twaalgos/remfin.hh"
-#include "twaalgos/randomgraph.hh"
-#include "twaalgos/dot.hh"
-#include "twaalgos/product.hh"
-#include "twaalgos/stutter.hh"
-#include "twaalgos/stats.hh"
-#include "twa/twagraph.hh"
-#include "twa/bdddict.hh"
-#include "misc/random.hh"
+#include <spot/misc/timer.hh>
+#include <spot/tl/apcollect.hh>
+#include <spot/twaalgos/complement.hh>
+#include <spot/twaalgos/remfin.hh>
+#include <spot/twaalgos/randomgraph.hh>
+#include <spot/twaalgos/dot.hh>
+#include <spot/twaalgos/product.hh>
+#include <spot/twaalgos/stutter.hh>
+#include <spot/twaalgos/stats.hh>
+#include <spot/twa/twagraph.hh>
+#include <spot/twa/bdddict.hh>
+#include <spot/misc/random.hh>
 #include <cstdio>
 #include <cstring>
 #include <vector>

configure.ac

@@ -26,7 +26,7 @@ AC_CONFIG_AUX_DIR([tools])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([1.11 gnu tar-ustar color-tests parallel-tests])
 AC_CONFIG_HEADERS([config.h])dnl Private config, not to be used in .hh files.
-AX_PREFIX_CONFIG_H([src/misc/_config.h])dnl Public config, for .hh files.
+AX_PREFIX_CONFIG_H([spot/misc/_config.h])dnl Public config, for .hh files.
 
 # If the user didn't supply a CFLAGS value,
 # set an empty one to prevent autoconf to stick -O2 -g here.
@@ -202,24 +202,24 @@ AC_CONFIG_FILES([
   iface/ltsmin/Makefile
   iface/Makefile
   lib/Makefile
-  src/bin/Makefile
-  src/bin/man/Makefile
-  src/graph/Makefile
-  src/kripke/Makefile
-  src/Makefile
-  src/misc/Makefile
-  src/parseaut/Makefile
-  src/parsetl/Makefile
-  src/priv/Makefile
-  src/sanity/Makefile
-  src/taalgos/Makefile
-  src/ta/Makefile
-  src/tests/defs
-  src/tests/Makefile
-  src/tl/Makefile
-  src/twaalgos/gtec/Makefile
-  src/twaalgos/Makefile
-  src/twa/Makefile
+  spot/bin/Makefile
+  spot/bin/man/Makefile
+  spot/graph/Makefile
+  spot/kripke/Makefile
+  spot/Makefile
+  spot/misc/Makefile
+  spot/parseaut/Makefile
+  spot/parsetl/Makefile
+  spot/priv/Makefile
+  spot/sanity/Makefile
+  spot/taalgos/Makefile
+  spot/ta/Makefile
+  spot/tests/defs
+  spot/tests/Makefile
+  spot/tl/Makefile
+  spot/twaalgos/gtec/Makefile
+  spot/twaalgos/Makefile
+  spot/twa/Makefile
   wrap/Makefile
   wrap/python/ajax/Makefile
   wrap/python/Makefile

debian/rules

@@ -50,8 +50,8 @@ PYOTHERS=$(filter-out $(PYDEFAULT), $(shell py3versions --supported))
 # compiled with -flto, the exception never traverses argp.  Moving
 # the try/catch block inside parse_opt() also fixes this praticular
 # problem, but who knows about other exceptions?   So as a workaround,
-# we simply disable -flto in src/bin/.
-FLTOWORKAROUND = perl -pi -e s/-flto// src/bin/Makefile
+# we simply disable -flto in spot/bin/.
+FLTOWORKAROUND = perl -pi -e s/-flto// spot/bin/Makefile
 
 # We want to build Spot twice: once to get profile data, and a second
 # time to use it.

doc/Doxyfile.in

@@ -152,7 +152,7 @@ FULL_PATH_NAMES        = YES
 # will be relative from the directory where doxygen is started.
 # This tag requires that the tag FULL_PATH_NAMES is set to YES.
 
-STRIP_FROM_PATH        = @top_srcdir@/src/ \
+STRIP_FROM_PATH        = @top_srcdir@/ \
                          @top_srcdir@/iface/ \
                          @srcdir@
 
@@ -163,7 +163,7 @@ STRIP_FROM_PATH        = @top_srcdir@/src/ \
 # specify the list of include paths that are normally passed to the compiler
 # using the -I flag.
 
-STRIP_FROM_INC_PATH    = @top_srcdir@/src/ \
+STRIP_FROM_INC_PATH    = @top_srcdir@/ \
                          @top_srcdir@/iface/
 
 # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
@@ -762,7 +762,7 @@ WARN_LOGFILE           =
 # Note: If this tag is empty the current directory is searched.
 
 INPUT                  = @srcdir@/mainpage.dox \
-                         @top_srcdir@/src \
+                         @top_srcdir@/spot \
                          @top_srcdir@/iface
 
 # This tag can be used to specify the character encoding of the source files
@@ -1992,7 +1992,7 @@ SEARCH_INCLUDES        = YES
 # preprocessor.
 # This tag requires that the tag SEARCH_INCLUDES is set to YES.
 
-INCLUDE_PATH           = @top_srcdir@/src
+INCLUDE_PATH           = @top_srcdir@
 
 # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
 # patterns (like *.h and *.hpp) to filter out the header-files in the

doc/Makefile.am

@@ -58,7 +58,7 @@ org:
 
 org-man:
 	mkdir -p $(srcdir)/userdoc/man
-	$(top_srcdir)/tools/man2html.pl $(top_srcdir)/src/bin/man $(srcdir)/userdoc/man
+	$(top_srcdir)/tools/man2html.pl $(top_srcdir)/spot/bin/man $(srcdir)/userdoc/man
 
 ORG_FILES = \
   org/.dir-locals.el.in \

doc/org/.dir-locals.el.in

@@ -6,14 +6,14 @@
 	      (eval .
 		    (progn
 		      (setenv "PATH"
-			      (concat "@abs_top_builddir@/src/bin"
+			      (concat "@abs_top_builddir@/spot/bin"
 				      path-separator
 				      (getenv "PATH")))
 		      (setenv "PYTHONPATH"
 			      (concat "@abs_top_builddir@/wrap/python/.libs:@abs_top_builddir@/wrap/python:@abs_top_srcdir@/wrap/python:"
 				      (getenv "PYTHONPATH")))
 		      (setenv "DYLD_LIBRARY_PATH"
-			      (concat "@abs_top_builddir@/wrap/python/.libs:@abs_top_builddir@/src/.libs:@abs_top_builddir@/buddy/src/.libs:"
+			      (concat "@abs_top_builddir@/wrap/python/.libs:@abs_top_builddir@/spot/.libs:@abs_top_builddir@/buddy/spot/.libs:"
 				      (getenv "DYLD_LIBRARY_PATH")))
 		      (setenv "SPOT_DOTDEFAULT" "Brf(Lato)")
 		      (setenv "SPOT_DOTEXTRA" "node[style=filled, fillcolor=\"#ffffa0\"] edge[arrowhead=vee, arrowsize=.7]")

doc/org/g++wrap.in

@@ -2,5 +2,5 @@
 # This is a wrapper around the compiler, to ensure that the code
 # example run from the org-mode file are all linked with Spot.
 exec @top_builddir@/libtool link @CXX@ -std=c++11 -Wall \
-     -I@abs_top_srcdir@/src -I@abs_top_srcdir@/buddy/src \
-     -I@abs_top_builddir@/src "$@" @abs_top_builddir@/src/libspot.la
+     -I@abs_top_builddir@ -I@abs_top_srcdir@ -I@abs_top_srcdir@/buddy/src \
+     "$@" @abs_top_builddir@/spot/libspot.la

doc/org/init.el.in

@@ -31,12 +31,12 @@
 (setq shell-file-name "@SHELL@")
 
 (setenv "PATH"
-	(concat "@abs_top_builddir@/src/bin" path-separator (getenv "PATH")))
+	(concat "@abs_top_builddir@/spot/bin" path-separator (getenv "PATH")))
 (setenv "PYTHONPATH"
 	(concat "@abs_top_builddir@/wrap/python/.libs:@abs_top_builddir@/wrap/python:@abs_top_srcdir@/wrap/python:"
 		(getenv "PYTHONPATH")))
 (setenv "DYLD_LIBRARY_PATH"
-	(concat "@abs_top_builddir@/wrap/python/.libs:@abs_top_builddir@/src/.libs:@abs_top_builddir@/buddy/src/.libs:"
+	(concat "@abs_top_builddir@/wrap/python/.libs:@abs_top_builddir@/spot/.libs:@abs_top_builddir@/buddy/spot/.libs:"
 		(getenv "DYLD_LIBRARY_PATH")))
 (setenv "SPOT_DOTDEFAULT" "Brf(Lato)")
 (setenv "SPOT_DOTEXTRA"

doc/org/tut01.org

@@ -69,8 +69,8 @@ exceptions.
 
 #+BEGIN_SRC C++ :results verbatim :exports both
   #include <iostream>
-  #include "tl/parse.hh"
-  #include "tl/print.hh"
+  #include <spot/tl/parse.hh>
+  #include <spot/tl/print.hh>
 
   int main()
   {
@@ -110,8 +110,8 @@ Here is how to call the infix parser explicitly:
 #+BEGIN_SRC C++ :results verbatim :exports both
   #include <string>
   #include <iostream>
-  #include "tl/parse.hh"
-  #include "tl/print.hh"
+  #include <spot/tl/parse.hh>
+  #include <spot/tl/print.hh>
 
   int main()
   {
@@ -152,8 +152,8 @@ with the "fixed" formula if you wish.  Here is an example:
 #+BEGIN_SRC C++ :results verbatim :exports both
   #include <string>
   #include <iostream>
-  #include "tl/parse.hh"
-  #include "tl/print.hh"
+  #include <spot/tl/parse.hh>
+  #include <spot/tl/print.hh>
 
   int main()
   {
@@ -193,8 +193,8 @@ of =parse_infix_psl()=.
 #+BEGIN_SRC C++ :results verbatim :exports both
   #include <string>
   #include <iostream>
-  #include "tl/parse.hh"
-  #include "tl/print.hh"
+  #include <spot/tl/parse.hh>
+  #include <spot/tl/print.hh>
 
   int main()
   {
@@ -237,8 +237,8 @@ For instance, let's see what happens if a PSL formulas is passed to
 #+BEGIN_SRC C++ :results verbatim :exports both
   #include <string>
   #include <iostream>
-  #include "tl/parse.hh"
-  #include "tl/print.hh"
+  #include <spot/tl/parse.hh>
+  #include <spot/tl/print.hh>
 
   int main()
   {
@@ -267,8 +267,8 @@ The first is to simply diagnose non-LTL formulas.
 #+BEGIN_SRC C++ :results verbatim :exports code
   #include <string>
   #include <iostream>
-  #include "tl/parse.hh"
-  #include "tl/print.hh"
+  #include <spot/tl/parse.hh>
+  #include <spot/tl/print.hh>
 
   int main()
   {
@@ -296,9 +296,9 @@ prepared to reject the formula any way.  In our example, we are lucky
 #+BEGIN_SRC C++ :results verbatim :exports both
   #include <string>
   #include <iostream>
-  #include "tl/parse.hh"
-  #include "tl/print.hh"
-  #include "tl/simplify.hh"
+  #include <spot/tl/parse.hh>
+  #include <spot/tl/print.hh>
+  #include <spot/tl/simplify.hh>
 
   int main()
   {

doc/org/tut02.org

@@ -80,9 +80,9 @@ destructor.
 #+BEGIN_SRC C++ :results verbatim :exports both
   #include <string>
   #include <iostream>
-  #include "tl/parse.hh"
-  #include "tl/print.hh"
-  #include "tl/relabel.hh"
+  #include <spot/tl/parse.hh>
+  #include <spot/tl/print.hh>
+  #include <spot/tl/relabel.hh>
 
   int main()
   {

doc/org/tut03.org

@@ -89,8 +89,8 @@ detail of the top-level oeprator in the formula.
 
 #+BEGIN_SRC C++ :results verbatim :exports both
   #include <iostream>
-  #include "tl/formula.hh"
-  #include "tl/print.hh"
+  #include <spot/tl/formula.hh>
+  #include <spot/tl/print.hh>
 
   int main()
   {
@@ -200,9 +200,9 @@ time time by not exploring further.
 
 #+BEGIN_SRC C++ :results verbatim :exports both
   #include <iostream>
-  #include "tl/formula.hh"
-  #include "tl/print.hh"
-  #include "tl/parse.hh"
+  #include <spot/tl/formula.hh>
+  #include <spot/tl/print.hh>
+  #include <spot/tl/parse.hh>
 
   int main()
   {
@@ -248,9 +248,9 @@ in a formula:
 
 #+BEGIN_SRC C++ :results verbatim :exports both
   #include <iostream>
-  #include "tl/formula.hh"
-  #include "tl/print.hh"
-  #include "tl/parse.hh"
+  #include <spot/tl/formula.hh>
+  #include <spot/tl/print.hh>
+  #include <spot/tl/parse.hh>
 
   spot::formula xchg_fg(spot::formula in)
   {

doc/org/tut10.org

@@ -129,10 +129,10 @@ never claim is done via the =print_never_claim= function.
 #+BEGIN_SRC C++ :results verbatim :exports both
   #include <string>
   #include <iostream>
-  #include "tl/parse.hh"
-  #include "tl/print.hh"
-  #include "twaalgos/translate.hh"
-  #include "twaalgos/neverclaim.hh"
+  #include <spot/tl/parse.hh>
+  #include <spot/tl/print.hh>
+  #include <spot/twaalgos/translate.hh>
+  #include <spot/twaalgos/neverclaim.hh>
 
   int main()
   {

doc/org/tut20.org

@@ -137,8 +137,8 @@ non-empty.
 #+BEGIN_SRC C++ :results verbatim :exports both :wrap SRC hoa
   #include <string>
   #include <iostream>
-  #include "parseaut/public.hh"
-  #include "twaalgos/hoa.hh"
+  #include <spot/parseaut/public.hh>
+  #include <spot/twaalgos/hoa.hh>
 
   int main()
   {

doc/org/tut21.org

@@ -61,9 +61,9 @@ corresponding BDD variable number, and then use for instance
 #+BEGIN_SRC C++ :results verbatim :exports both
   #include <string>
   #include <iostream>
-  #include "parseaut/public.hh"
-  #include "twaalgos/hoa.hh"
-  #include "twa/bddprint.hh"
+  #include <spot/parseaut/public.hh>
+  #include <spot/twaalgos/hoa.hh>
+  #include <spot/twa/bddprint.hh>
 
   void custom_print(std::ostream& out, spot::twa_graph_ptr& aut);
 

doc/org/tut22.org

@@ -7,8 +7,8 @@ This example demonstrates how to create an automaton in C++, and then print it.
 
 #+BEGIN_SRC C++ :results verbatim :exports both :wrap SRC hoa
   #include <iostream>
-  #include "twaalgos/hoa.hh"
-  #include "twa/twagraph.hh"
+  #include <spot/twaalgos/hoa.hh>
+  #include <spot/twa/twagraph.hh>
 
   int main(void)
   {

doc/org/tut30.org

@@ -231,9 +231,9 @@ automaton to process.
 
 #+BEGIN_SRC C++ :results verbatim :exports both :wrap SRC hoa
   #include <iostream>
-  #include "parseaut/public.hh"
-  #include "twaalgos/postproc.hh"
-  #include "twaalgos/hoa.hh"
+  #include <spot/parseaut/public.hh>
+  #include <spot/twaalgos/postproc.hh>
+  #include <spot/twaalgos/hoa.hh>
 
   int main()
   {

iface/ltsmin/Makefile.am

@@ -17,7 +17,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
               $(BUDDY_CPPFLAGS) -I$(top_srcdir)/ltdl
 AM_CXXFLAGS = $(WARNING_CXXFLAGS)
 
@@ -27,7 +27,7 @@ ltsmin_HEADERS = ltsmin.hh
 
 lib_LTLIBRARIES = libspotltsmin.la
 libspotltsmin_la_LIBADD = \
-  $(top_builddir)/src/libspot.la \
+  $(top_builddir)/spot/libspot.la \
   $(top_builddir)/ltdl/libltdlc.la -lpthread
 libspotltsmin_la_LDFLAGS = -no-undefined $(SYMBOLIC_LDFLAGS)
 libspotltsmin_la_SOURCES = ltsmin.cc
@@ -42,10 +42,10 @@ check_SCRIPTS = defs
 TESTS = check.test finite.test finite2.test kripke.test
 EXTRA_DIST = $(TESTS) beem-peterson.4.dve finite.dve finite.pm
 
-kripke.test: $(top_builddir)/src/tests/parse_print$(EXEEXT)
+kripke.test: $(top_builddir)/spot/tests/parse_print$(EXEEXT)
 
-$(top_builddir)/src/tests/parse_print$(EXEEXT):
-	cd $(top_builddir)/src/tests && \
+$(top_builddir)/spot/tests/parse_print$(EXEEXT):
+	cd $(top_builddir)/spot/tests && \
 	$(MAKE) $(AM_MAKEFLAGS) parse_print$(EXEEXT)
 
 distclean-local:

iface/ltsmin/kripke.test

@@ -34,9 +34,9 @@ fi
 set -e
 
 run 0 ../modelcheck -gK ${srcdir}/finite.dve 'F("P.a > 5")' > output
-run 0 ${top_builddir}/src/tests/parse_print output | tr -d '"' > output2
+run 0 ${top_builddir}/spot/tests/parse_print output | tr -d '"' > output2
 tr -d '"' < output >outputF
 cmp outputF output2
 
 ../modelcheck -gK $srcdir/beem-peterson.4.dve '!G("pos[1] < 3")' > outputP
-${top_builddir}/src/tests/ikwiad -e -KPoutputP '!G("pos[1] < 3")'
+${top_builddir}/spot/tests/ikwiad -e -KPoutputP '!G("pos[1] < 3")'

iface/ltsmin/ltsmin.cc

@@ -30,12 +30,12 @@
 # define WEXITSTATUS(x) ((x) & 0xff)
 #endif
 
-#include "ltsmin.hh"
-#include "misc/hashfunc.hh"
-#include "misc/fixpool.hh"
-#include "misc/mspool.hh"
-#include "misc/intvcomp.hh"
-#include "misc/intvcmp2.hh"
+#include <iface/ltsmin/ltsmin.hh>
+#include <spot/misc/hashfunc.hh>
+#include <spot/misc/fixpool.hh>
+#include <spot/misc/mspool.hh>
+#include <spot/misc/intvcomp.hh>
+#include <spot/misc/intvcmp2.hh>
 
 namespace spot
 {

iface/ltsmin/ltsmin.hh

@@ -19,8 +19,8 @@
 
 #pragma once
 
-#include "kripke/kripke.hh"
-#include "tl/apcollect.hh"
+#include <spot/kripke/kripke.hh>
+#include <spot/tl/apcollect.hh>
 
 namespace spot
 {

iface/ltsmin/modelcheck.cc

@@ -17,19 +17,19 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "ltsmin.hh"
-#include "twaalgos/dot.hh"
-#include "tl/defaultenv.hh"
-#include "tl/parse.hh"
-#include "twaalgos/translate.hh"
-#include "twaalgos/emptiness.hh"
-#include "twaalgos/postproc.hh"
-#include "twa/twaproduct.hh"
-#include "misc/timer.hh"
-#include "misc/memusage.hh"
+#include <iface/ltsmin/ltsmin.hh>
+#include <spot/twaalgos/dot.hh>
+#include <spot/tl/defaultenv.hh>
+#include <spot/tl/parse.hh>
+#include <spot/twaalgos/translate.hh>
+#include <spot/twaalgos/emptiness.hh>
+#include <spot/twaalgos/postproc.hh>
+#include <spot/twa/twaproduct.hh>
+#include <spot/misc/timer.hh>
+#include <spot/misc/memusage.hh>
 #include <cstring>
-#include "kripke/kripkegraph.hh"
-#include "twaalgos/hoa.hh"
+#include <spot/kripke/kripkegraph.hh>
+#include <spot/twaalgos/hoa.hh>
 
 static void
 syntax(char* prog)

spot/bin/Makefile.am

@@ -19,7 +19,7 @@
 
 SUBDIRS = . man
 
-AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(BUDDY_CPPFLAGS) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) $(BUDDY_CPPFLAGS) \
               -I$(top_builddir)/lib -I$(top_srcdir)/lib
 AM_CXXFLAGS = $(WARNING_CXXFLAGS)
 LDADD = libcommon.a $(top_builddir)/lib/libgnu.la ../libspot.la

spot/bin/autfilt.cc

@@ -37,27 +37,27 @@
 #include "common_conv.hh"
 #include "common_hoaread.hh"
 
-#include "twaalgos/product.hh"
-#include "twaalgos/isdet.hh"
-#include "twaalgos/stutter.hh"
-#include "twaalgos/isunamb.hh"
-#include "misc/optionmap.hh"
-#include "misc/timer.hh"
-#include "misc/random.hh"
-#include "parseaut/public.hh"
-#include "tl/exclusive.hh"
-#include "twaalgos/remprop.hh"
-#include "twaalgos/randomize.hh"
-#include "twaalgos/are_isomorphic.hh"
-#include "twaalgos/canonicalize.hh"
-#include "twaalgos/mask.hh"
-#include "twaalgos/sepsets.hh"
-#include "twaalgos/stripacc.hh"
-#include "twaalgos/remfin.hh"
-#include "twaalgos/cleanacc.hh"
-#include "twaalgos/dtwasat.hh"
-#include "twaalgos/complement.hh"
-#include "twaalgos/strength.hh"
+#include <spot/twaalgos/product.hh>
+#include <spot/twaalgos/isdet.hh>
+#include <spot/twaalgos/stutter.hh>
+#include <spot/twaalgos/isunamb.hh>
+#include <spot/misc/optionmap.hh>
+#include <spot/misc/timer.hh>
+#include <spot/misc/random.hh>
+#include <spot/parseaut/public.hh>
+#include <spot/tl/exclusive.hh>
+#include <spot/twaalgos/remprop.hh>
+#include <spot/twaalgos/randomize.hh>
+#include <spot/twaalgos/are_isomorphic.hh>
+#include <spot/twaalgos/canonicalize.hh>
+#include <spot/twaalgos/mask.hh>
+#include <spot/twaalgos/sepsets.hh>
+#include <spot/twaalgos/stripacc.hh>
+#include <spot/twaalgos/remfin.hh>
+#include <spot/twaalgos/cleanacc.hh>
+#include <spot/twaalgos/dtwasat.hh>
+#include <spot/twaalgos/complement.hh>
+#include <spot/twaalgos/strength.hh>
 
 static const char argp_program_doc[] ="\
 Convert, transform, and filter omega-automata.\v\

spot/bin/common_aoutput.cc

@@ -25,15 +25,15 @@
 #include "common_post.hh"
 #include "common_cout.hh"
 
-#include "twa/bddprint.hh"
+#include <spot/twa/bddprint.hh>
 
-#include "twaalgos/dot.hh"
-#include "twaalgos/lbtt.hh"
-#include "twaalgos/hoa.hh"
-#include "twaalgos/neverclaim.hh"
-#include "twaalgos/stutter.hh"
-#include "twaalgos/isunamb.hh"
-#include "twaalgos/strength.hh"
+#include <spot/twaalgos/dot.hh>
+#include <spot/twaalgos/lbtt.hh>
+#include <spot/twaalgos/hoa.hh>
+#include <spot/twaalgos/neverclaim.hh>
+#include <spot/twaalgos/stutter.hh>
+#include <spot/twaalgos/isunamb.hh>
+#include <spot/twaalgos/strength.hh>
 
 automaton_format_t automaton_format = Dot;
 static const char* opt_dot = nullptr;

spot/bin/common_aoutput.hh

@@ -24,13 +24,13 @@
 #include <argp.h>
 #include <memory>
 
-#include "parseaut/public.hh"
+#include <spot/parseaut/public.hh>
 
-#include "twaalgos/stats.hh"
-#include "twaalgos/sccinfo.hh"
-#include "twaalgos/gtec/gtec.hh"
-#include "twaalgos/word.hh"
-#include "twaalgos/isdet.hh"
+#include <spot/twaalgos/stats.hh>
+#include <spot/twaalgos/sccinfo.hh>
+#include <spot/twaalgos/gtec/gtec.hh>
+#include <spot/twaalgos/word.hh>
+#include <spot/twaalgos/isdet.hh>
 #include "common_file.hh"
 
 

spot/bin/common_conv.hh

@@ -20,7 +20,7 @@
 #pragma once
 
 #include "common_sys.hh"
-#include "twa/twagraph.hh"
+#include <spot/twa/twagraph.hh>
 
 int to_int(const char* s);
 int to_pos_int(const char* s);

spot/bin/common_finput.hh

@@ -23,7 +23,7 @@
 
 #include <argp.h>
 #include <vector>
-#include "tl/parse.hh"
+#include <spot/tl/parse.hh>
 
 struct job
 {

spot/bin/common_hoaread.hh

@@ -23,7 +23,7 @@
 
 #include <argp.h>
 
-#include "parseaut/public.hh"
+#include <spot/parseaut/public.hh>
 
 
 extern const struct argp hoaread_argp;

spot/bin/common_output.cc

@@ -21,9 +21,9 @@
 #include "common_output.hh"
 #include <iostream>
 #include <sstream>
-#include "tl/print.hh"
-#include "misc/formater.hh"
-#include "misc/escape.hh"
+#include <spot/tl/print.hh>
+#include <spot/misc/formater.hh>
+#include <spot/misc/escape.hh>
 #include "common_cout.hh"
 #include "error.h"
 

spot/bin/common_output.hh

@@ -24,8 +24,8 @@
 #include <argp.h>
 #include <map>
 #include <memory>
-#include "tl/formula.hh"
-#include "twaalgos/stats.hh"
+#include <spot/tl/formula.hh>
+#include <spot/twaalgos/stats.hh>
 #include "common_output.hh"
 #include "common_file.hh"
 

spot/bin/common_post.hh

@@ -20,7 +20,7 @@
 #pragma once
 
 #include "common_sys.hh"
-#include "twaalgos/postproc.hh"
+#include <spot/twaalgos/postproc.hh>
 #include <argp.h>
 
 extern const struct argp post_argp;	     // postprocessing enabled

spot/bin/common_r.hh

@@ -20,7 +20,7 @@
 #pragma once
 
 #include "common_sys.hh"
-#include "tl/simplify.hh"
+#include <spot/tl/simplify.hh>
 
 #define OPT_R 'r'
 

spot/bin/common_setup.cc

@@ -23,7 +23,7 @@
 #include <iostream>
 #include <signal.h>
 #include <sys/wait.h>
-#include "misc/tmpfile.hh"
+#include <spot/misc/tmpfile.hh>
 
 const char* argp_program_bug_address = "<" PACKAGE_BUGREPORT ">";
 

spot/bin/common_trans.cc

@@ -28,9 +28,9 @@
 
 #include "error.h"
 
-#include "tl/print.hh"
+#include <spot/tl/print.hh>
 #include "common_conv.hh"
-#include "misc/escape.hh"
+#include <spot/misc/escape.hh>
 
 // A set of tools for which we know the correct output
 static struct shorthands_t

spot/bin/common_trans.hh

@@ -23,9 +23,9 @@
 #include <vector>
 #include <argp.h>
 
-#include "misc/formater.hh"
-#include "misc/tmpfile.hh"
-#include "twa/twagraph.hh"
+#include <spot/misc/formater.hh>
+#include <spot/misc/tmpfile.hh>
+#include <spot/twa/twagraph.hh>
 
 
 extern const struct argp trans_argp;

spot/bin/dstar2tgba.cc

@@ -34,17 +34,17 @@
 #include "common_file.hh"
 #include "common_hoaread.hh"
 
-#include "twaalgos/dot.hh"
-#include "twaalgos/lbtt.hh"
-#include "twaalgos/hoa.hh"
-#include "twaalgos/neverclaim.hh"
-#include "twaalgos/stats.hh"
-#include "twaalgos/totgba.hh"
-#include "twa/bddprint.hh"
-#include "misc/optionmap.hh"
-#include "misc/timer.hh"
-#include "parseaut/public.hh"
-#include "twaalgos/sccinfo.hh"
+#include <spot/twaalgos/dot.hh>
+#include <spot/twaalgos/lbtt.hh>
+#include <spot/twaalgos/hoa.hh>
+#include <spot/twaalgos/neverclaim.hh>
+#include <spot/twaalgos/stats.hh>
+#include <spot/twaalgos/totgba.hh>
+#include <spot/twa/bddprint.hh>
+#include <spot/misc/optionmap.hh>
+#include <spot/misc/timer.hh>
+#include <spot/parseaut/public.hh>
+#include <spot/twaalgos/sccinfo.hh>
 
 static const char argp_program_doc[] ="\
 Convert automata with any acceptance condition into variants of \

spot/bin/genltl.cc

@@ -86,8 +86,8 @@
 #include <string>
 #include <cstdlib>
 #include <cstring>
-#include "tl/formula.hh"
-#include "tl/relabel.hh"
+#include <spot/tl/formula.hh>
+#include <spot/tl/relabel.hh>
 
 using namespace spot;
 

spot/bin/ltl2tgba.cc

@@ -33,11 +33,11 @@
 #include "common_aoutput.hh"
 #include "common_post.hh"
 
-#include "tl/formula.hh"
-#include "tl/print.hh"
-#include "twaalgos/translate.hh"
-#include "misc/optionmap.hh"
-#include "misc/timer.hh"
+#include <spot/tl/formula.hh>
+#include <spot/tl/print.hh>
+#include <spot/twaalgos/translate.hh>
+#include <spot/misc/optionmap.hh>
+#include <spot/misc/timer.hh>
 
 static const char argp_program_doc[] ="\
 Translate linear-time formulas (LTL/PSL) into Büchi automata.\n\n\

spot/bin/ltl2tgta.cc

@@ -32,18 +32,18 @@
 #include "common_finput.hh"
 #include "common_post.hh"
 
-#include "tl/parse.hh"
-#include "tl/print.hh"
-#include "tl/simplify.hh"
-#include "twaalgos/dot.hh"
-#include "twaalgos/ltl2tgba_fm.hh"
-#include "twaalgos/translate.hh"
-#include "twa/bddprint.hh"
+#include <spot/tl/parse.hh>
+#include <spot/tl/print.hh>
+#include <spot/tl/simplify.hh>
+#include <spot/twaalgos/dot.hh>
+#include <spot/twaalgos/ltl2tgba_fm.hh>
+#include <spot/twaalgos/translate.hh>
+#include <spot/twa/bddprint.hh>
 
-#include "taalgos/tgba2ta.hh"
-#include "taalgos/dot.hh"
-#include "taalgos/minimize.hh"
-#include "misc/optionmap.hh"
+#include <spot/taalgos/tgba2ta.hh>
+#include <spot/taalgos/dot.hh>
+#include <spot/taalgos/minimize.hh>
+#include <spot/misc/optionmap.hh>
 
 const char argp_program_doc[] ="\
 Translate linear-time formulas (LTL/PSL) into Testing Automata.\n\n\

spot/bin/ltlcross.cc

@@ -39,31 +39,31 @@
 #include "common_file.hh"
 #include "common_finput.hh"
 #include "common_hoaread.hh"
-#include "parseaut/public.hh"
-#include "tl/print.hh"
-#include "tl/apcollect.hh"
-#include "tl/mutation.hh"
-#include "tl/relabel.hh"
-#include "twaalgos/lbtt.hh"
-#include "twaalgos/hoa.hh"
-#include "twaalgos/product.hh"
-#include "twaalgos/remfin.hh"
-#include "twaalgos/gtec/gtec.hh"
-#include "twaalgos/randomgraph.hh"
-#include "twaalgos/sccinfo.hh"
-#include "twaalgos/isweakscc.hh"
-#include "twaalgos/word.hh"
-#include "twaalgos/complement.hh"
-#include "twaalgos/cleanacc.hh"
-#include "misc/formater.hh"
-#include "twaalgos/stats.hh"
-#include "twaalgos/isdet.hh"
-#include "twaalgos/isunamb.hh"
-#include "misc/escape.hh"
-#include "misc/hash.hh"
-#include "misc/random.hh"
-#include "misc/tmpfile.hh"
-#include "misc/timer.hh"
+#include <spot/parseaut/public.hh>
+#include <spot/tl/print.hh>
+#include <spot/tl/apcollect.hh>
+#include <spot/tl/mutation.hh>
+#include <spot/tl/relabel.hh>
+#include <spot/twaalgos/lbtt.hh>
+#include <spot/twaalgos/hoa.hh>
+#include <spot/twaalgos/product.hh>
+#include <spot/twaalgos/remfin.hh>
+#include <spot/twaalgos/gtec/gtec.hh>
+#include <spot/twaalgos/randomgraph.hh>
+#include <spot/twaalgos/sccinfo.hh>
+#include <spot/twaalgos/isweakscc.hh>
+#include <spot/twaalgos/word.hh>
+#include <spot/twaalgos/complement.hh>
+#include <spot/twaalgos/cleanacc.hh>
+#include <spot/misc/formater.hh>
+#include <spot/twaalgos/stats.hh>
+#include <spot/twaalgos/isdet.hh>
+#include <spot/twaalgos/isunamb.hh>
+#include <spot/misc/escape.hh>
+#include <spot/misc/hash.hh>
+#include <spot/misc/random.hh>
+#include <spot/misc/tmpfile.hh>
+#include <spot/misc/timer.hh>
 
 const char argp_program_doc[] ="\
 Call several LTL/PSL translators and cross-compare their output to detect \

spot/bin/ltldo.cc

@@ -36,13 +36,13 @@
 #include "common_trans.hh"
 #include "common_hoaread.hh"
 
-#include "tl/relabel.hh"
-#include "misc/bareword.hh"
-#include "misc/timer.hh"
-#include "twaalgos/lbtt.hh"
-#include "twaalgos/relabel.hh"
-#include "twaalgos/totgba.hh"
-#include "parseaut/public.hh"
+#include <spot/tl/relabel.hh>
+#include <spot/misc/bareword.hh>
+#include <spot/misc/timer.hh>
+#include <spot/twaalgos/lbtt.hh>
+#include <spot/twaalgos/relabel.hh>
+#include <spot/twaalgos/totgba.hh>
+#include <spot/parseaut/public.hh>
 
 const char argp_program_doc[] ="\
 Run LTL/PSL formulas through another program, performing conversion\n\

spot/bin/ltlfilt.cc

@@ -34,19 +34,19 @@
 #include "common_conv.hh"
 #include "common_r.hh"
 
-#include "misc/hash.hh"
-#include "tl/simplify.hh"
-#include "tl/length.hh"
-#include "tl/relabel.hh"
-#include "tl/unabbrev.hh"
-#include "tl/remove_x.hh"
-#include "tl/apcollect.hh"
-#include "tl/exclusive.hh"
-#include "tl/print.hh"
-#include "twaalgos/ltl2tgba_fm.hh"
-#include "twaalgos/minimize.hh"
-#include "twaalgos/strength.hh"
-#include "twaalgos/stutter.hh"
+#include <spot/misc/hash.hh>
+#include <spot/tl/simplify.hh>
+#include <spot/tl/length.hh>
+#include <spot/tl/relabel.hh>
+#include <spot/tl/unabbrev.hh>
+#include <spot/tl/remove_x.hh>
+#include <spot/tl/apcollect.hh>
+#include <spot/tl/exclusive.hh>
+#include <spot/tl/print.hh>
+#include <spot/twaalgos/ltl2tgba_fm.hh>
+#include <spot/twaalgos/minimize.hh>
+#include <spot/twaalgos/strength.hh>
+#include <spot/twaalgos/stutter.hh>
 
 const char argp_program_doc[] ="\
 Read a list of formulas and output them back after some optional processing.\v\

spot/bin/ltlgrind.cc

@@ -27,7 +27,7 @@
 #include "common_output.hh"
 #include "common_conv.hh"
 
-#include "tl/mutation.hh"
+#include <spot/tl/mutation.hh>
 
 enum {
   OPT_AP2CONST = 1,

spot/bin/randaut.cc

@@ -34,12 +34,12 @@
 #include "common_aoutput.hh"
 #include "common_conv.hh"
 
-#include "misc/timer.hh"
-#include "misc/random.hh"
+#include <spot/misc/timer.hh>
+#include <spot/misc/random.hh>
 
-#include "twa/bddprint.hh"
-#include "twaalgos/randomgraph.hh"
-#include "twaalgos/canonicalize.hh"
+#include <spot/twa/bddprint.hh>
+#include <spot/twaalgos/randomgraph.hh>
+#include <spot/twaalgos/canonicalize.hh>
 
 
 const char argp_program_doc[] = "\

spot/bin/randltl.cc

@@ -33,10 +33,10 @@
 #include "common_conv.hh"
 
 #include <sstream>
-#include "tl/randomltl.hh"
-#include "tl/simplify.hh"
-#include "misc/random.hh"
-#include "misc/optionmap.hh"
+#include <spot/tl/randomltl.hh>
+#include <spot/tl/simplify.hh>
+#include <spot/misc/random.hh>
+#include <spot/misc/optionmap.hh>
 
 const char argp_program_doc[] ="\
 Generate random temporal logic formulas.\n\n\

spot/graph/Makefile.am

@@ -18,7 +18,7 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-AM_CPPFLAGS = -I$(srcdir)/..
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
 AM_CXXFLAGS = $(WARNING_CXXFLAGS)
 
 graphdir = $(pkgincludedir)/graph
@@ -26,4 +26,3 @@ graphdir = $(pkgincludedir)/graph
 graph_HEADERS = \
   graph.hh \
   ngraph.hh
-

spot/graph/graph.hh

@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "misc/common.hh"
+#include <spot/misc/common.hh>
 #include <vector>
 #include <type_traits>
 #include <tuple>

spot/graph/ngraph.hh

@@ -21,7 +21,7 @@
 
 #include <unordered_map>
 #include <vector>
-#include "graph.hh"
+#include <spot/graph/graph.hh>
 
 namespace spot
 {

spot/kripke/Makefile.am

@@ -1,6 +1,6 @@
 ## -*- coding: utf-8 -*-
-## Copyright (C) 2009, 2011, 2013, 2014 Laboratoire de Recherche et
-## Developpement de l'Epita (LRDE).
+## Copyright (C) 2009, 2011, 2013, 2014, 2015 Laboratoire de Recherche
+## et Developpement de l'Epita (LRDE).
 ##
 ## This file is part of Spot, a model checking library.
 ##
@@ -17,7 +17,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS)
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) $(BUDDY_CPPFLAGS)
 AM_CXXFLAGS = $(WARNING_CXXFLAGS)
 
 kripkedir = $(pkgincludedir)/kripke

spot/kripke/fairkripke.cc

@@ -17,7 +17,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "fairkripke.hh"
+#include <spot/kripke/fairkripke.hh>
 
 namespace spot
 {

spot/kripke/fairkripke.hh

@@ -19,8 +19,8 @@
 
 #pragma once
 
-#include "twa/twa.hh"
-#include "fwd.hh"
+#include <spot/twa/twa.hh>
+#include <spot/kripke/fwd.hh>
 
 /// \addtogroup kripke Kripke Structures
 /// \ingroup twa

spot/kripke/kripke.cc

@@ -17,7 +17,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "kripke.hh"
+#include <spot/kripke/kripke.hh>
 
 namespace spot
 {

spot/kripke/kripke.hh

@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "fairkripke.hh"
+#include <spot/kripke/fairkripke.hh>
 
 namespace spot
 {

spot/kripke/kripkegraph.hh

@@ -20,9 +20,9 @@
 #pragma once
 
 #include <iosfwd>
-#include "kripke.hh"
-#include "graph/graph.hh"
-#include "tl/formula.hh"
+#include <spot/kripke/kripke.hh>
+#include <spot/graph/graph.hh>
+#include <spot/tl/formula.hh>
 
 namespace spot
 {

spot/misc/Makefile.am

@@ -20,7 +20,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS) \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) $(BUDDY_CPPFLAGS) \
               -I$(top_builddir)/lib -I$(top_srcdir)/lib
 AM_CXXFLAGS = $(WARNING_CXXFLAGS)
 

spot/misc/bareword.cc

@@ -21,9 +21,9 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config.h"
-#include "bareword.hh"
+#include <spot/misc/bareword.hh>
 #include <ctype.h>
-#include "escape.hh"
+#include <spot/misc/escape.hh>
 
 namespace spot
 {

spot/misc/bareword.hh

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "common.hh"
+#include <spot/misc/common.hh>
 #include <string>
 
 namespace spot

spot/misc/bitvect.cc

@@ -20,7 +20,7 @@
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
-#include "bitvect.hh"
+#include <spot/misc/bitvect.hh>
 #include <new>
 #include <iostream>
 #include <cmath>