#include "floor.h"
#include "cmd-activate.h"
#include "object.h"
-#include "objectkind.h"
+#include "object/object-kind.h"
#include "object-boost.h"
#include "object-curse.h"
#include "object-ego.h"
#include "files.h"
#include "grid.h"
#include "monster.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
#include "player-class.h"
#include "player-personality.h"
-#include "world.h"
+#include "world/world.h"
/*
* The artifact arrays