Organize src/ and test/ headers

- Add context.h and move context-related functions from xkb-priv.h to
  it.
- Move xkb_context definition back to context.c.
- Add keysym.h and move keysym upper/lower/keypad from xkb-priv.h to it.
- Rename xkb-priv.h to map.h since it only contains keymap-related
  definitions and declarations now.
- Remove unnecessary includes and some and some other small cleanups.

Signed-off-by: Ran Benita <ran234@gmail.com>

11 files changed, 6 insertions, 41 deletions

diff --git a/test/common.c b/test/common.c
index 3049555..372c642 100644
--- a/test/common.c
+++ b/test/common.c
@@ -30,17 +30,12 @@
  *         Ran Benita <ran234@gmail.com>
  */
 
-#include <assert.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 #include <limits.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "xkbcommon/xkbcommon.h"
 #include "test.h"
 
 const char *
diff --git a/test/context.c b/test/context.c
index d6acd05..e151dd0 100644
--- a/test/context.c
+++ b/test/context.c
@@ -23,10 +23,8 @@
  * Author: Daniel Stone <daniel@fooishbar.org>
  */
 
-#include <assert.h>
-
-#include "xkbcommon/xkbcommon.h"
 #include "test.h"
+#include "context.h"
 
 int
 main(void)
diff --git a/test/filecomp.c b/test/filecomp.c
index c3a425c..dca4fe5 100644
--- a/test/filecomp.c
+++ b/test/filecomp.c
@@ -21,11 +21,6 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "xkbcommon/xkbcommon.h"
 #include "test.h"
 
 static int
diff --git a/test/interactive.c b/test/interactive.c
index d132d15..332f57c 100644
--- a/test/interactive.c
+++ b/test/interactive.c
@@ -28,9 +28,6 @@
 #include <limits.h>
 #include <locale.h>
 #include <signal.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <sysexits.h>
 #include <unistd.h>
@@ -38,7 +35,6 @@
 #include <sys/epoll.h>
 #include <linux/input.h>
 
-#include "xkbcommon/xkbcommon.h"
 #include "test.h"
 
 struct keyboard {
diff --git a/test/keyseq.c b/test/keyseq.c
index c7d0918..33510c3 100644
--- a/test/keyseq.c
+++ b/test/keyseq.c
@@ -21,13 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <assert.h>
-#include <stdarg.h>
-#include <stdio.h>
-
 #include <linux/input.h>
 
-#include "xkbcommon/xkbcommon.h"
 #include "test.h"
 
 enum {
diff --git a/test/keysym.c b/test/keysym.c
index ba22d55..1bf704b 100644
--- a/test/keysym.c
+++ b/test/keysym.c
@@ -21,10 +21,6 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "test.h"
 
 static int
diff --git a/test/log.c b/test/log.c
index bad2cb2..cf59045 100644
--- a/test/log.c
+++ b/test/log.c
@@ -21,13 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <assert.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "test.h"
-#include "xkb-priv.h"
+#include "context.h"
 
 #pragma GCC diagnostic ignored "-Wmissing-format-attribute"
 
diff --git a/test/rmlvo-to-kccgst.c b/test/rmlvo-to-kccgst.c
index ec2c0c4..338cbb8 100644
--- a/test/rmlvo-to-kccgst.c
+++ b/test/rmlvo-to-kccgst.c
@@ -24,7 +24,7 @@
 #include <unistd.h>
 
 #include "test.h"
-#include "xkb-priv.h"
+#include "xkbcomp-priv.h"
 #include "rules.h"
 
 int
diff --git a/test/rules-file.c b/test/rules-file.c
index 5ddd074..b2091de 100644
--- a/test/rules-file.c
+++ b/test/rules-file.c
@@ -21,14 +21,10 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <assert.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <string.h>
 #include <time.h>
 
 #include "test.h"
-#include "xkb-priv.h"
+#include "xkbcomp-priv.h"
 #include "rules.h"
 
 #define BENCHMARK_ITERATIONS 20000
diff --git a/test/rulescomp.c b/test/rulescomp.c
index 3b4de26..5457d00 100644
--- a/test/rulescomp.c
+++ b/test/rulescomp.c
@@ -21,11 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <assert.h>
-#include <stdio.h>
 #include <time.h>
 
-#include "xkbcommon/xkbcommon.h"
 #include "test.h"
 
 #define BENCHMARK_ITERATIONS 1000
diff --git a/test/test.h b/test/test.h
index a3fdee0..2a9b0fa 100644
--- a/test/test.h
+++ b/test/test.h
@@ -23,6 +23,8 @@
  * Author: Daniel Stone <daniel@fooishbar.org>
  */
 
+#include <assert.h>
+
 #include "xkbcommon/xkbcommon.h"
 #include "utils.h"