#include "canvasview.h"
#include "instance.h"
#include "app.h"
-#include "cellrenderer_value.h"
-#include "cellrenderer_timetrack.h"
+#include "cellrenderer/cellrenderer_value.h"
+#include "cellrenderer/cellrenderer_timetrack.h"
#include "workarea.h"
#include "dialogs/dialog_color.h"
#include "eventkey.h"
-#include "state_polygon.h"
-#include "state_bline.h"
-#include "state_normal.h"
-#include "state_eyedrop.h"
+#include "states/state_polygon.h"
+#include "states/state_bline.h"
+#include "states/state_normal.h"
+#include "states/state_eyedrop.h"
#include "ducktransform_scale.h"
#include "ducktransform_translate.h"
#include "preview.h"
#include "audiocontainer.h"
-#include "widget_timeslider.h"
-#include "keyframedial.h"
+#include "widgets/widget_timeslider.h"
+#include "dials/keyframedial.h"
#include <synfigapp/main.h>
#include <synfigapp/inputdevice.h>