Again.

libs/sort.c

@@ -1,5 +1,8 @@
 /* See LICENSE file for copyright and license details. */
 
+static char **tokenize(char *source, const char *delim, int *llen);
+static int arrayhas(char **list, int length, char *item);
+
 char ** tokenize(char *source, const char *delim, int *llen) {
     int listlength = 0, list_size = 0;
     char **list = NULL, *token;

libs/sort.h

@@ -1,4 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-
-static char **tokenize(char *source, const char *delim, int *llen);
-static int arrayhas(char **list, int length, char *item);

libs/stream.c

@@ -1,5 +1,9 @@
 /* See LICENSE file for copyright and license details. */
 
+static void readstdin(void);
+static void readfile(void);
+static int parsemarkup(int index);
+
 void readstdin(void) {
     char buf[sizeof tx.text], *p;
     size_t i, itemsiz = 0;

libs/stream.h

@@ -1,5 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-
-static void readstdin(void);
-static void readfile(void);
-static int parsemarkup(int index);

spmenu.c

@@ -8,9 +8,10 @@
 #include <string.h>
 #include <locale.h>
 #include <unistd.h>
-#include "libs/draw/draw.h"
 #include "libs/main.c"
 
+#include "libs/draw/draw.h"
+
 #ifndef VERSION
 #define VERSION "unknown"
 #endif
@@ -175,11 +176,10 @@ static size_t listsize;
 // various headers
 #include "libs/options.h"
 #include "libs/draw.h"
-#include "libs/stream.h"
 #include "libs/arg.h"
+
 #include "libs/x11/inc.h"
 #include "libs/wl/inc.h"
-#include "libs/sort.h"
 
 static char *fonts[] = { font };
 
@@ -190,12 +190,12 @@ static char *fonts[] = { font };
 #include "libs/sort.c"
 #include "libs/match.c"
 #include "libs/schemes.c"
+#include "libs/stream.c"
 #include "libs/draw.c"
 #include "libs/conf/config.c"
 #include "libs/argv.c"
 #include "libs/history.c"
 #include "libs/arg.c"
-#include "libs/stream.c"
 
 #if X11
 static Key keys[] = {