remove unnneded headers; reorganization

datastream.c

@@ -1,25 +1,35 @@
-#define PL_MPEG_IMPLEMENTATION
+#include "cell.h"
+
+#define PL_MPEG_IMPLEMENTATION
+#include "pl_mpeg.h"
+
+struct datastream {
+  plm_t *plm;
+  JSValue callback;
+  JSContext *js;
+  int width;
+  int height;
+};
+
+typedef struct datastream datastream;
 
-#include "datastream.h"
 #include "cell.h"
 
 #include "limits.h"
 #include <stdbool.h>
 #include <stdlib.h>
-#include "font.h"
-#include "render.h"
 #include <string.h>
 
 #include "cbuf.h"
 
-QJSCLASS(datastream,)
-
 void datastream_free(JSRuntime *rt,datastream *ds)
 {
   plm_destroy(ds->plm);
   free(ds);
 }
 
+QJSCLASS(datastream,)
+
 struct datastream *ds_openvideo(void *raw, size_t rawlen)
 {
   struct datastream *ds = malloc(sizeof(*ds));