refactor: remove guarded helper headers

xim/Makefile

@@ -15,7 +15,7 @@ $(PROG): $(OBJS) ../ipc.c ../ipc.h
 
 $(OBJS): ../ipc.h
 
-$(TEST): ../tests/xim_test.c keymap.c keymap.h ximtext.c ximtext.h
+$(TEST): ../tests/xim_test.c keymap.c ximtext.c
 	$(CC) $(CFLAGS) -o $@ ../tests/xim_test.c keymap.c ximtext.c $(XIM_LIBS)
 
 check: $(TEST)

xim/keymap.c

@@ -1,5 +1,5 @@
+#include <stdint.h>
 #include <xkbcommon/xkbcommon.h>
-#include "keymap.h"
 
 enum
 {

xim/keymap.h

@@ -1,8 +0,0 @@
-#ifndef STRANS_XIM_KEYMAP_H
-#define STRANS_XIM_KEYMAP_H
-
-#include <stdint.h>
-
-uint32_t keymaplookup(const uint32_t*, int, uint16_t);
-
-#endif

xim/main.c

@@ -7,8 +7,9 @@
 #include <xcb-imdkit/imdkit.h>
 #include <xcb-imdkit/encoding.h>
 #include "ipc.h"
-#include "keymap.h"
-#include "ximtext.h"
+
+uint32_t keymaplookup(const uint32_t*, int, uint16_t);
+char *ximcompound(const char*, size_t, size_t*);
 
 typedef struct Ic Ic;
 struct Ic

xim/ximtext.c

@@ -2,7 +2,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <xcb-imdkit/encoding.h>
-#include "ximtext.h"
 
 char*
 ximutf8compound(const char *s, size_t len, size_t *outlen)

xim/ximtext.h

@@ -1,4 +0,0 @@
-#include <stddef.h>
-
-char *ximcompound(const char*, size_t, size_t*);
-char *ximutf8compound(const char*, size_t, size_t*);