From 850c32c5ac296c3e6dd490b34f314ca697acd842 Mon Sep 17 00:00:00 2001
From: David Herrmann <dh.herrmann@gmail.com>
Date: Sat, 17 Aug 2013 14:59:29 +0200
Subject: [PATCH] Include libtsm.h instead of sub-headers

Move all source files to include libtsm.h directly. This will get rid of
the recently introduced warnings if sub-headers are included directly.

Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
---
 src/tsm_screen.c       | 3 +--
 src/tsm_unicode.c      | 2 +-
 src/tsm_vte.c          | 4 +---
 src/tsm_vte_charsets.c | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/tsm_screen.c b/src/tsm_screen.c
index 007dcc2..871fad7 100644
--- a/src/tsm_screen.c
+++ b/src/tsm_screen.c
@@ -35,11 +35,10 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
+#include "libtsm.h"
 #include "shl_llog.h"
 #include "shl_misc.h"
 #include "shl_timer.h"
-#include "tsm_screen.h"
-#include "tsm_unicode.h"
 
 #define LLOG_SUBSYSTEM "tsm_screen"
 
diff --git a/src/tsm_unicode.c b/src/tsm_unicode.c
index 3567ccb..d0aee97 100644
--- a/src/tsm_unicode.c
+++ b/src/tsm_unicode.c
@@ -58,10 +58,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include "external/wcwidth.h"
+#include "libtsm.h"
 #include "shl_array.h"
 #include "shl_hashtable.h"
 #include "shl_misc.h"
-#include "tsm_unicode.h"
 
 /*
  * Unicode Symbol Handling
diff --git a/src/tsm_vte.c b/src/tsm_vte.c
index 31fab0e..bafc7ae 100644
--- a/src/tsm_vte.c
+++ b/src/tsm_vte.c
@@ -49,11 +49,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include "libtsm.h"
 #include "shl_llog.h"
 #include "shl_misc.h"
-#include "tsm_screen.h"
-#include "tsm_unicode.h"
-#include "tsm_vte.h"
 
 #ifdef BUILD_HAVE_XKBCOMMON
 #  include <xkbcommon/xkbcommon-keysyms.h>
diff --git a/src/tsm_vte_charsets.c b/src/tsm_vte_charsets.c
index cf539c9..f356e52 100644
--- a/src/tsm_vte_charsets.c
+++ b/src/tsm_vte_charsets.c
@@ -66,8 +66,8 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
+#include "libtsm.h"
 #include "shl_misc.h"
-#include "tsm_vte.h"
 
 /*
  * Lower Unicode character set. This maps the characters to the basic ASCII
-- 
2.7.4