#include "object-curse.h"
#include "object-flavor.h"
#include "monsterrace-hook.h"
-#include "objectkind-hook.h"
+#include "object/object-kind-hook.h"
#include "mutation.h"
#include "artifact.h"
#include "player-status.h"
#include "player-class.h"
#include "player-damage.h"
-#include "spells.h"
+#include "spell/spells-type.h"
#include "spells-summon.h"
#include "spells-object.h"
#include "spells-status.h"