--- a/dav/optparser.h	Sun Aug 08 14:59:02 2021 +0200
+++ b/dav/optparser.h	Sun Aug 08 16:49:47 2021 +0200
@@ -30,17 +30,12 @@
 #define	OPTPARSER_H
 
 #include <ucx/map.h>
+#include "opt.h"
 
 #ifdef	__cplusplus
 extern "C" {
 #endif
 
-typedef struct {
-    UcxMap *options;
-    char   **argv;
-    int    argc;
-} CmdArgs;
-
 CmdArgs* cmd_parse_args(int argc, char **argv);
 char* cmd_getoption(CmdArgs *arg, char *name);