move attrib and event modules to kernel

src/alchemy.c

@@ -33,7 +33,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/unit.h>
 
 /* util includes */
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/gamedata.h>
 #include <util/base36.h>
 #include <util/log.h>

src/attributes/attributes.c

@@ -53,8 +53,8 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/building.h>
 
 /* util includes */
-#include <util/attrib.h>
-#include <util/event.h>
+#include <kernel/attrib.h>
+#include <kernel/event.h>
 #include <util/gamedata.h>
 #include <util/macros.h>
 #include <util/resolve.h>

src/attributes/dict.c

@@ -29,7 +29,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/unit.h>
 
 /* util includes */
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
 #include <util/log.h>
 #include <util/gamedata.h>

src/attributes/follow.c

@@ -22,7 +22,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/config.h>
 #include <kernel/unit.h>
 
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/gamedata.h>
 #include <util/variant.h>
 

src/attributes/hate.c

@@ -22,7 +22,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <kernel/unit.h>
 
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/gamedata.h>
 #include <util/macros.h>
 #include <util/resolve.h>

src/attributes/iceberg.c

@@ -20,7 +20,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/config.h>
 #include "iceberg.h"
 
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 
 attrib_type at_iceberg = {
     "iceberg_drift",

src/attributes/key.c

@@ -20,7 +20,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/config.h>
 #include "key.h"
 
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/gamedata.h>
 #include <util/log.h>
 #include <storage.h>

src/attributes/key.test.c

@@ -2,7 +2,7 @@
 #include "key.h"
 #include "dict.h"
 
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
 #include <CuTest.h>
 #include <stdlib.h>

src/attributes/movement.c

@@ -20,7 +20,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/config.h>
 #include "movement.h"
 
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/gamedata.h>
 #include <util/macros.h>
 

src/attributes/otherfaction.c

@@ -23,7 +23,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/ally.h>
 #include <kernel/faction.h>
 #include <kernel/unit.h>
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/gamedata.h>
 
 #include <storage.h>

src/attributes/otherfaction.test.c

@@ -7,7 +7,7 @@
 #include <kernel/region.h>
 #include <kernel/faction.h>
 
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 
 #include <CuTest.h>
 #include <tests.h>

src/attributes/overrideroads.c

@@ -20,7 +20,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/config.h>
 #include "overrideroads.h"
 
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 
 attrib_type at_overrideroads = {
     "roads_override", NULL, NULL, NULL, a_writestring, a_readstring

src/attributes/racename.c

@@ -20,7 +20,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/config.h>
 #include "racename.h"
 
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/strings.h>
 
 /* libc includes */

src/attributes/raceprefix.c

@@ -20,7 +20,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/config.h>
 #include "raceprefix.h"
 
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/strings.h>
 
 #include <assert.h>

src/attributes/reduceproduction.c

@@ -22,7 +22,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/region.h>
 #include <kernel/messages.h>
 #include <util/message.h>
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <assert.h>
 
 static int age_reduceproduction(attrib * a, void *owner)

src/attributes/seenspell.c

@@ -23,7 +23,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/faction.h>
 #include <kernel/spell.h>
 #include <kernel/spellbook.h>
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/gamedata.h>
 #include <util/log.h>
 #include <util/macros.h>

src/attributes/stealth.c

@@ -1,7 +1,7 @@
 #include <platform.h>
 #include <kernel/unit.h>
 #include <kernel/region.h>
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <attributes/stealth.h>
 
 #include <stdlib.h>

src/attributes/targetregion.c

@@ -22,7 +22,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/config.h>
 #include <kernel/region.h>
 
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/gamedata.h>
 #include <util/resolve.h>
 

src/battle.c

@@ -60,7 +60,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 /* util includes */
 #include <util/assert.h>
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
 #include <util/language.h>
 #include <util/lists.h>

src/bind_region.c

@@ -22,7 +22,7 @@
 #include <kernel/terrain.h>
 #include <kernel/messages.h>
 
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
 #include <util/log.h>
 #include <util/macros.h>

src/bind_ship.c

@@ -14,7 +14,7 @@
 #include <kernel/ship.h>
 #include <kernel/build.h>
 
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/language.h>
 #include <util/log.h>
 #include <util/macros.h>

src/bind_unit.c

@@ -11,9 +11,9 @@
 #include "skill.h"
 
 /*  util includes */
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
-#include <util/event.h>
+#include <kernel/event.h>
 #include <util/log.h>
 #include <util/macros.h>
 #include "util/variant.h"

src/bindings.c

@@ -47,7 +47,7 @@
 
 #include <modules/score.h>
 
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
 #include <util/language.h>
 #include <util/log.h>

src/chaos.c

@@ -34,7 +34,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/terrainid.h>
 #include <kernel/unit.h>
 
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/rng.h>
 
 #include <stdlib.h>

src/creport.c

@@ -64,7 +64,7 @@ without prior permission by the authors of Eressea.
 #include "kernel/unit.h"
 
 /* util includes */
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
 #include <util/crmessage.h>
 #include <util/strings.h>

src/economy.c

@@ -64,9 +64,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "kernel/unit.h"
 
 /* util includes */
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
-#include <util/event.h>
+#include <kernel/event.h>
 #include <util/goodies.h>
 #include <util/language.h>
 #include <util/lists.h>

src/economy.test.c

@@ -19,7 +19,7 @@
 #include <kernel/terrainid.h>
 #include <kernel/unit.h>
 
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/language.h>
 #include <util/macros.h>
 

src/give.c

@@ -41,9 +41,9 @@
 #include <kernel/unit.h>
 
 /* util includes */
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
-#include <util/event.h>
+#include <kernel/event.h>
 #include <util/log.h>
 #include <util/macros.h>
 #include <util/parser.h>

src/gmtool.c

@@ -30,7 +30,7 @@
 #include "kernel/ship.h"
 #include "kernel/terrain.h"
 
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
 #include <util/lists.h>
 #include <util/macros.h>

src/helpers.c

@@ -19,8 +19,8 @@ without prior permission by the authors of Eressea.
 #include "alchemy.h"
 #include "magic.h"
 
-#include <util/attrib.h>
-#include <util/event.h>
+#include <kernel/attrib.h>
+#include <kernel/event.h>
 #include <util/functions.h>
 #include <util/gamedata.h>
 #include <util/log.h>

src/items.c

@@ -33,8 +33,8 @@
 #include <triggers/changerace.h>
 #include <triggers/timeout.h>
 
-#include <util/attrib.h>
-#include <util/event.h>
+#include <kernel/attrib.h>
+#include <kernel/event.h>
 #include <util/macros.h>
 #include <util/parser.h>
 #include <util/rand.h>

src/items/speedsail.c

@@ -31,7 +31,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <attributes/movement.h>
 
 /* util includes */
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/log.h>
 #include <util/macros.h>
 

src/jsonconf.c

@@ -29,7 +29,7 @@ without prior permission by the authors of Eressea.
 #include "kernel/spellbook.h"
 
 /* util includes */
-#include "util/attrib.h"
+#include "kernel/attrib.h"
 #include "util/crmessage.h"
 #include "util/functions.h"
 #include "util/language.h"

src/kernel/CMakeLists.txt

@@ -12,6 +12,7 @@ ENDIF(SQLITE3_FOUND)
 SET(_TEST_FILES
 alliance.test.c
 ally.test.c
+attrib.test.c
 build.test.c
 building.test.c
 # callbacks.test.c
@@ -22,6 +23,7 @@ config.test.c
 curse.test.c
 database.test.c
 equipment.test.c
+# event.test.c
 faction.test.c
 group.test.c
 item.test.c
@@ -46,6 +48,7 @@ SET(_FILES
 ${_DBFILES}
 alliance.c
 ally.c
+attrib.c
 build.c
 building.c
 callbacks.c
@@ -55,6 +58,7 @@ config.c
 connection.c
 curse.c
 equipment.c
+event.c
 faction.c
 group.c
 item.c

src/kernel/alliance.c

@@ -27,7 +27,7 @@ without prior permission by the authors of Eressea.
 #include <attributes/key.h>
 
 /* util includes */
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
 #include <util/language.h>
 #include <util/parser.h>

src/kernel/ally.c

@@ -10,7 +10,7 @@
 #include "objtypes.h"
 #include "plane.h"
 
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/strings.h>
 #include <util/gamedata.h>
 

src/kernel/attrib.c

@@ -19,12 +19,12 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <platform.h>
 #include "attrib.h"
 
-#include "gamedata.h"
-#include "log.h"
-#include "variant.h"
-#include "storage.h"
-#include "strings.h"
+#include <util/log.h>
+#include <util/strings.h>
+#include <util/variant.h>
+#include <util/gamedata.h>
 
+#include <storage.h>
 #include <critbit.h>
 
 #include <assert.h>

src/kernel/attrib.h

@@ -20,7 +20,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define ATTRIB_H
 
 #include <stdbool.h>
-#include "variant.h"
+#include <util/variant.h>
 #ifdef __cplusplus
 extern "C" {
 #endif

src/kernel/build.c

@@ -52,9 +52,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/unit.h>
 
 /* from libutil */
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
-#include <util/event.h>
+#include <kernel/event.h>
 #include <util/goodies.h>
 #include <util/language.h>
 #include <util/log.h>

src/kernel/building.c

@@ -38,9 +38,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "lighthouse.h"
 
 /* util includes */
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
-#include <util/event.h>
+#include <kernel/event.h>
 #include <util/functions.h>
 #include <util/gamedata.h>
 #include <util/language.h>

src/kernel/config.c

@@ -50,10 +50,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "unit.h"
 
 /* util includes */
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
 #include <util/crmessage.h>
-#include <util/event.h>
+#include <kernel/event.h>
 #include <util/language.h>
 #include <util/functions.h>
 #include <util/log.h>

src/kernel/config.test.c

@@ -7,7 +7,7 @@
 #include <kernel/order.h>
 #include <util/language.h>
 #include <util/base36.h>
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 
 #include <iniparser.h>
 

src/kernel/connection.c

@@ -26,7 +26,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "terrain.h"
 #include "unit.h"
 
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
 #include <util/gamedata.h>
 #include <util/language.h>

src/kernel/curse.c

@@ -34,7 +34,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "unit.h"
 
 /* util includes */
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
 #include <util/gamedata.h>
 #include <util/goodies.h>

src/kernel/curse.test.c

@@ -4,7 +4,7 @@
 #include <kernel/region.h>
 #include <kernel/save.h>
 #include <kernel/unit.h>
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/rng.h>
 #include <util/gamedata.h>
 #include <util/message.h>

src/kernel/event.c

@@ -18,12 +18,12 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <platform.h>
 #include "event.h"
+#include "attrib.h"
 
 /* util includes */
-#include "attrib.h"
-#include "gamedata.h"
-#include "log.h"
-#include "strings.h"
+#include <util/gamedata.h>
+#include <util/log.h>
+#include <util/strings.h>
 
 #include <storage.h>
 

src/kernel/event.h

@@ -22,7 +22,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 extern "C" {
 #endif
 
-#include "variant.h"
+#include <util/variant.h>
 
     struct attrib;
     struct trigger;

src/kernel/faction.c

@@ -42,9 +42,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <attributes/racename.h>
 
 /* util includes */
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
-#include <util/event.h>
+#include <kernel/event.h>
 #include <util/gamedata.h>
 #include <util/goodies.h>
 #include <util/lists.h>

src/kernel/group.c

@@ -30,7 +30,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <attributes/raceprefix.h>
 
 /* util includes */
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
 #include <util/gamedata.h>
 #include <util/resolve.h>

src/kernel/group.test.c

@@ -9,7 +9,7 @@
 #include "save.h"
 
 #include <util/gamedata.h>
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <attributes/key.h>
 
 #include <stream.h>

src/kernel/item.c

@@ -35,7 +35,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "unit.h"
 
 /* util includes */
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
 #include <util/functions.h>
 #include <util/goodies.h>

src/kernel/plane.c

@@ -25,7 +25,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "faction.h"
 
 /* util includes */
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/resolve.h>
 #include <util/strings.h>
 #include <util/lists.h>

src/kernel/race.c

@@ -37,7 +37,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "unit.h"
 
 /* util includes */
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/functions.h>
 #include <util/umlaut.h>
 #include <util/language.h>

src/kernel/region.c

@@ -42,7 +42,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 /* util includes */
 #include <util/assert.h>
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/gamedata.h>
 #include <util/strings.h>
 #include <util/lists.h>

src/kernel/save.c

@@ -57,9 +57,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 /* util includes */
 #include <util/assert.h>
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
-#include <util/event.h>
+#include <kernel/event.h>
 #include <util/filereader.h>
 #include <util/gamedata.h>
 #include <util/goodies.h>

src/kernel/save.test.c

@@ -17,9 +17,9 @@
 #include <triggers/changefaction.h>
 #include <triggers/createunit.h>
 #include <triggers/timeout.h>
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
-#include <util/event.h>
+#include <kernel/event.h>
 #include <util/gamedata.h>
 #include <util/password.h>
 #include <util/path.h>

src/kernel/ship.c

@@ -34,9 +34,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "skill.h"
 
 /* util includes */
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
-#include <util/event.h>
+#include <kernel/event.h>
 #include <util/language.h>
 #include <util/lists.h>
 #include <util/log.h>

src/kernel/ship.test.c

@@ -7,7 +7,7 @@
 #include <kernel/unit.h>
 #include <kernel/curse.h>
 
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 
 #include <spells/shipcurse.h>
 #include <attributes/movement.h>

src/kernel/skills.c

@@ -24,7 +24,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "region.h"
 #include "unit.h"
 
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/goodies.h>
 #include <util/language.h>
 #include <util/log.h>

src/kernel/terrain.c

@@ -30,7 +30,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "terrainid.h"
 
 #include <util/log.h>
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/strings.h>
 
 /* libc includes */

src/kernel/unit.c

@@ -50,9 +50,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "guard.h"
 
 /* util includes */
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
-#include <util/event.h>
+#include <kernel/event.h>
 #include <util/gamedata.h>
 #include <util/strings.h>
 #include <util/language.h>

src/kernel/unit.test.c

@@ -9,7 +9,7 @@
 #include <kernel/region.h>
 #include <kernel/spell.h>
 #include <kernel/terrain.h>
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
 #include <util/language.h>
 #include <util/macros.h>

src/laws.c

@@ -71,9 +71,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "kernel/unit.h"
 
 /* util includes */
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
-#include <util/event.h>
+#include <kernel/event.h>
 #include <util/goodies.h>
 #include <util/language.h>
 #include <util/lists.h>

src/laws.test.c

@@ -20,7 +20,7 @@
 #include <kernel/terrainid.h>
 #include <kernel/unit.h>
 
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
 #include <util/language.h>
 #include <util/message.h>

src/lighthouse.c

@@ -9,7 +9,7 @@
 #include <kernel/terrain.h>
 #include <kernel/unit.h>
 #include <util/log.h>
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 
 #include <assert.h>
 #include <math.h>

src/lighthouse.test.c

@@ -2,7 +2,7 @@
 
 #include "lighthouse.h"
 
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <kernel/config.h>
 #include <kernel/faction.h>
 #include <kernel/unit.h>

src/magic.c

@@ -62,9 +62,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/unit.h>
 
 /* util includes */
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
-#include <util/event.h>
+#include <kernel/event.h>
 #include <util/gamedata.h>
 #include <util/language.h>
 #include <util/lists.h>

src/magic.test.c

@@ -17,7 +17,7 @@
 #include <kernel/unit.h>
 #include <kernel/pool.h>
 
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/language.h>
 #include <util/strings.h>
 

src/market.c

@@ -16,7 +16,7 @@ without prior permission by the authors of Eressea.
 
 #include <assert.h>
 
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <selist.h>
 #include <util/rng.h>
 

src/modules/autoseed.c

@@ -31,7 +31,7 @@
 #include <attributes/key.h>
 
 /* util includes */
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
 #include <util/goodies.h>
 #include <util/language.h>

src/modules/gmcmd.c

@@ -32,7 +32,7 @@
 #include <kernel/unit.h>
 
 /* util includes */
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/gamedata.h>
 #include <util/macros.h>
 

src/modules/museum.c

@@ -38,7 +38,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <move.h>
 
 /* util includes */
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
 #include <util/functions.h>
 #include <util/gamedata.h>

src/modules/xmas.c

@@ -25,9 +25,9 @@
 #include <move.h>
 
 /* util includes */
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
-#include <util/event.h>
+#include <kernel/event.h>
 #include <util/gamedata.h>
 #include <util/goodies.h>
 #include <util/resolve.h>

src/monsters.c

@@ -52,9 +52,9 @@
 #include "kernel/unit.h"
 
 /* util includes */
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
-#include <util/event.h>
+#include <kernel/event.h>
 #include <util/language.h>
 #include <util/lists.h>
 #include <util/log.h>

src/monsters.test.c

@@ -18,7 +18,7 @@
 #include "skill.h"
 #include "study.h"
 
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/language.h>
 #include <util/message.h>
 #include <util/nrmessage.h>

src/move.c

@@ -72,7 +72,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 /* util includes */
 #include <util/assert.h>
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
 #include <util/gamedata.h>
 #include <util/language.h>

src/move.test.c

@@ -17,7 +17,7 @@
 #include <kernel/race.h>
 #include <kernel/order.h>
 
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/language.h>
 #include <util/message.h>
 #include <util/base36.h>

src/piracy.c

@@ -15,7 +15,7 @@
 #include <kernel/terrain.h>
 #include <kernel/unit.h>
 
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
 #include <util/goodies.h>
 #include <util/language.h>

src/races/races.c

@@ -21,7 +21,7 @@
 #include <kernel/terrain.h>
 #include <kernel/unit.h>
 
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/functions.h>
 #include <util/rng.h>
 

src/randenc.c

@@ -56,7 +56,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "kernel/unit.h"
 
 /* util includes */
-#include "util/attrib.h"
+#include "kernel/attrib.h"
 #include "util/language.h"
 #include "util/lists.h"
 #include "util/log.h"

src/renumber.c

@@ -9,7 +9,7 @@
 #include <kernel/order.h>
 #include <kernel/messages.h>
 
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
 #include <util/parser.h>
 

src/report.c

@@ -77,7 +77,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "kernel/alliance.h"
 
 /* util includes */
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
 #include "util/bsdstring.h"
 #include <util/goodies.h>

src/reports.c

@@ -62,7 +62,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "kernel/unit.h"
 
 /* util includes */
-#include "util/attrib.h"
+#include "kernel/attrib.h"
 #include "util/base36.h"
 #include "util/bsdstring.h"
 #include "util/functions.h"

src/reports.test.c

@@ -25,7 +25,7 @@
 #include "kernel/spellbook.h"
 #include "kernel/terrain.h"
 
-#include "util/attrib.h"
+#include "kernel/attrib.h"
 #include "util/language.h"
 #include "util/lists.h"
 #include "util/message.h"

src/spells.c

@@ -70,9 +70,9 @@
 
 /* util includes */
 #include <util/assert.h>
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
-#include <util/event.h>
+#include <kernel/event.h>
 #include <util/gamedata.h>
 #include <util/language.h>
 #include <util/macros.h>

src/spells.test.c

@@ -12,7 +12,7 @@
 #include <kernel/region.h>
 #include <kernel/spell.h>
 #include <kernel/unit.h>
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/language.h>
 #include <util/message.h>
 #include <spells/regioncurse.h>

src/spells/borders.c

@@ -13,7 +13,7 @@
 #include <kernel/terrain.h>
 #include <kernel/unit.h>
 
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/gamedata.h>
 #include <util/language.h>
 #include <util/macros.h>

src/spells/combatspells.c

@@ -36,7 +36,7 @@
 #include <move.h>
 
 /* util includes */
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
 #include <util/log.h>
 #include <util/macros.h>

src/spells/magicresistance.test.c

@@ -8,7 +8,7 @@
 #include <kernel/unit.h>
 #include <util/message.h>
 #include <util/language.h>
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <spells/regioncurse.h>
 #include "spells.h"
 

src/spy.c

@@ -44,7 +44,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <attributes/stealth.h>
 
 /* util includes */
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
 #include <util/parser.h>
 #include <util/rand.h>

src/spy.test.c

@@ -11,7 +11,7 @@
 #include <kernel/order.h>
 #include <kernel/item.h>
 #include <kernel/messages.h>
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/language.h>
 #include <util/message.h>
 #include <util/crmessage.h>

src/study.c

@@ -46,7 +46,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/unit.h>
 
 /* util includes */
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
 #include <util/language.h>
 #include <util/log.h>

src/study.test.c

@@ -11,7 +11,7 @@
 #include <kernel/race.h>
 #include <kernel/region.h>
 #include <kernel/unit.h>
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/rand.h>
 #include <util/message.h>
 #include <util/language.h>

src/travelthru.c

@@ -27,7 +27,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/ship.h>
 #include <kernel/region.h>
 #include <kernel/faction.h>
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/log.h>
 #include <util/language.h>
 

src/travelthru.test.c

@@ -3,7 +3,7 @@
 #include <kernel/region.h>
 #include <kernel/unit.h>
 #include <kernel/faction.h>
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/macros.h>
 
 #include "travelthru.h"

src/triggers/changefaction.c

@@ -24,9 +24,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/faction.h>
 
 /* util includes */
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
-#include <util/event.h>
+#include <kernel/event.h>
 #include <util/gamedata.h>
 #include <util/log.h>
 #include <util/macros.h>

src/triggers/changerace.c

@@ -24,9 +24,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/race.h>
 
 /* util includes */
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
-#include <util/event.h>
+#include <kernel/event.h>
 #include <util/gamedata.h>
 #include <util/log.h>
 #include <util/macros.h>

src/triggers/clonedied.c

@@ -26,9 +26,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/unit.h>
 
 /* util includes */
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
-#include <util/event.h>
+#include <kernel/event.h>
 #include <util/gamedata.h>
 #include <util/log.h>
 #include <util/macros.h>

src/triggers/createcurse.c

@@ -24,9 +24,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/unit.h>
 
 /* util includes */
-#include <util/attrib.h>
+#include <kernel/attrib.h>
 #include <util/base36.h>
-#include <util/event.h>
+#include <kernel/event.h>
 #include <util/gamedata.h>
 #include <util/log.h>
 #include <util/macros.h>