mv xbm/ ..

src/main.c

@@ -1,6 +1,6 @@
 #include "labwc.h"
 #include "theme/theme.h"
-#include "theme/xbm/xbm.h"
+#include "xbm/xbm.h"
 #include "common/spawn.h"
 
 #include <cairo.h>

src/meson.build

@@ -16,3 +16,4 @@ subdir('common')
 subdir('config')
 subdir('theme')
 subdir('debug')
+subdir('xbm')

src/theme/meson.build

@@ -2,4 +2,3 @@ labwc_sources += files(
   'theme.c',
 )
 
-subdir('xbm')

src/xbm/parse.c

@@ -11,7 +11,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "theme/xbm/parse.h"
+#include "xbm/parse.h"
 #include "common/bug-on.h"
 
 static uint32_t color;

src/xbm/tokenize.c

@@ -8,7 +8,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "theme/xbm/tokenize.h"
+#include "xbm/tokenize.h"
 
 static char *current_buffer_position;
 static struct token *tokens;

src/xbm/xbm.c

@@ -8,8 +8,8 @@
 #include <stdlib.h>
 
 #include "theme/theme.h"
-#include "theme/xbm/xbm.h"
-#include "theme/xbm/parse.h"
+#include "xbm/xbm.h"
+#include "xbm/parse.h"
 #include "config/rcxml.h"
 #include "common/dir.h"
 #include "common/grab-file.h"