Also revert b28d7ba8 as it was a follow-up to Damien's work.

ChangeLog

@@ -169,13 +169,6 @@
 	iface/nips/nipstest/emptiness.test: Prefix bytecode filenames
 	with $srcdir so the tests work in VPATH builds.
 
-2008-06-12  Alexandre Duret-Lutz  <adl@lrde.epita.fr>
-
-	* wrap/python/spot.i: Adjust includes after the previous patch.
-	This is enough to make the python/ directory compile, but not
-	enough to make it pass "make check".  Some major work is needed
-	after the changes from 2008-04-16.
-
 2008-06-11  Alexandre Duret-Lutz  <adl@lrde.epita.fr>
 
 	* iface/nips/dottynips.cc: Include ctsdlib for exit().
@@ -183,9 +176,6 @@
 
 	* src/sanity/includes.test: Remove empty line at beginning of file.
 
-	* src/internal/formula.hh (formula::hash): Remove the const
-	qualifier from the return type, GCC 4.3.1 complains.
-
 2008-06-02  Guillaume SADEGH  <sadegh@lrde.epita.fr>
 
 	Test suite for the NipsVM front-end.

wrap/python/spot.i

-// Copyright (C) 2003, 2004, 2005, 2006, 2008  Laboratoire d'Informatique
+// Copyright (C) 2003, 2004, 2005, 2006  Laboratoire d'Informatique
 // de Paris 6 (LIP6), dpartement Systmes Rpartis Coopratifs (SRC),
 // Universit Pierre et Marie Curie.
 //
@@ -40,6 +40,13 @@
 #include "misc/random.hh"
 
 #include "ltlast/formula.hh"
+#include "ltlast/refformula.hh"
+#include "ltlast/atomic_prop.hh"
+#include "ltlast/binop.hh"
+#include "ltlast/constant.hh"
+#include "ltlast/multop.hh"
+#include "ltlast/unop.hh"
+#include "ltlast/visitor.hh"
 
 #include "ltlenv/environment.hh"
 #include "ltlenv/defaultenv.hh"
@@ -105,6 +112,13 @@ using namespace spot;
 %include "misc/modgray.hh"
 
 %include "ltlast/formula.hh"
+%include "ltlast/refformula.hh"
+%include "ltlast/atomic_prop.hh"
+%include "ltlast/binop.hh"
+%include "ltlast/constant.hh"
+%include "ltlast/multop.hh"
+%include "ltlast/unop.hh"
+%include "ltlast/visitor.hh"
 
 %include "ltlenv/environment.hh"
 %include "ltlenv/defaultenv.hh"