Separate actions and state.

[SVN r59563]

block.cpp

@@ -20,8 +20,8 @@
 #include <boost/fusion/include/adapt_struct.hpp>
 #include "grammars.hpp"
 #include "block.hpp"
-#include "utils.hpp"
-#include "actions_class.hpp"
+#include "template.hpp"
+#include "actions.hpp"
 #include "parse_utils.hpp"
 #include "code.hpp"