--- /dev/null
+#ifndef TINYDS_TDM_COMMON_H
+#define TINYDS_TDM_COMMON_H
+
+#include <assert.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <time.h>
+
+#include <drm_fourcc.h>
+#include <pixman.h>
+#include <wayland-server.h>
+#include <libds/log.h>
+#include <libds/backend.h>
+#include <libds/output.h>
+#include <libds/compositor.h>
+#include <libds/xdg_shell.h>
+#include <libds-tizen/allocator/tbm.h>
+#include <libds-tizen/backend/tdm.h>
+#include <libds/backend/libinput.h>
+#include <libds-tizen/tbm_server.h>
+#include <libds-tizen/dpms.h>
+#include <libds/input_device.h>
+#include <libds/keyboard.h>
+#include <libds/touch.h>
+#include <libds/pointer.h>
+#include <libds/seat.h>
+#include <libds-tizen/input_devicemgr.h>
+#include <xkbcommon/xkbcommon.h>
+#include <libds/interfaces/keyboard.h>
+#include <libds-tizen/launch.h>
+#include <libds-tizen/backend/tdm_output_hwc.h>
+#include <libds-tizen/input_method.h>
+#include <libds-tizen/text_input.h>
+
+#define USE_TDM_BUFFER_QUEUE
+#define CURSOR_W 10
+#define CURSOR_H 16
+#define TINYDS_UNUSED __attribute__((unused))
+
+#endif
#include <libds-tizen/dpms.h>
-#include "tinyds-tdm-common.h"
+#include "tinyds-common.h"
#include "tinyds-dpms.h"
struct tinyds_dpms
#include <libds-tizen/policy.h>
-#include "tinyds-tdm-common.h"
+#include "tinyds-common.h"
#include "tinyds-policy.h"
struct tinyds_policy
+++ /dev/null
-#ifndef TINYDS_TDM_COMMON_H
-#define TINYDS_TDM_COMMON_H
-
-#include <assert.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <time.h>
-
-#include <drm_fourcc.h>
-#include <pixman.h>
-#include <wayland-server.h>
-#include <libds/log.h>
-#include <libds/backend.h>
-#include <libds/output.h>
-#include <libds/compositor.h>
-#include <libds/xdg_shell.h>
-#include <libds-tizen/allocator/tbm.h>
-#include <libds-tizen/backend/tdm.h>
-#include <libds/backend/libinput.h>
-#include <libds-tizen/tbm_server.h>
-#include <libds-tizen/dpms.h>
-#include <libds/input_device.h>
-#include <libds/keyboard.h>
-#include <libds/touch.h>
-#include <libds/pointer.h>
-#include <libds/seat.h>
-#include <libds-tizen/input_devicemgr.h>
-#include <xkbcommon/xkbcommon.h>
-#include <libds/interfaces/keyboard.h>
-#include <libds-tizen/launch.h>
-#include <libds-tizen/backend/tdm_output_hwc.h>
-#include <libds-tizen/input_method.h>
-#include <libds-tizen/text_input.h>
-
-#define USE_TDM_BUFFER_QUEUE
-#define CURSOR_W 10
-#define CURSOR_H 16
-#define TINYDS_UNUSED __attribute__((unused))
-
-#endif
#ifndef TINYDS_TDM_H
#define TINYDS_TDM_H
-#include "tinyds-tdm-common.h"
+#include "tinyds-common.h"
#ifdef USE_TDM_BUFFER_QUEUE
#include "pixman-tbm-helper.h"