diff -r b3f24e23bc25 -r bf54085ce341 src/highlighter.h
--- a/src/highlighter.h	Wed Aug 31 12:58:48 2016 +0200
+++ b/src/highlighter.h	Wed Aug 31 14:41:56 2016 +0200
@@ -30,13 +30,7 @@
 #ifndef CODEGENS_H
 #define	CODEGENS_H
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#include "ucx/string.h"
 #include "ucx/buffer.h"
-#include "ucx/utils.h"
 
 #ifdef	__cplusplus
 extern "C" {
@@ -46,16 +40,16 @@
     int multiline_comment;
     UcxBuffer* primary_buffer;
     UcxBuffer* secondary_buffer;
-} HighlighterData;
+} c2html_highlighter_data;
 
-HighlighterData* new_highlighter_data();
-void free_highlighter_data(HighlighterData*);
+#define C2HTML_HIGHLIGHTER_SIGNATURE \
+char*,UcxBuffer*, c2html_highlighter_data*
 
-typedef void(*highlighter_func)(char*,UcxBuffer*,HighlighterData*);
+typedef void(*c2html_highlighter_func)(C2HTML_HIGHLIGHTER_SIGNATURE);
 
-void plain_highlighter(char *src, UcxBuffer *dest, HighlighterData *hd);
-void c_highlighter(char *src, UcxBuffer *dest, HighlighterData *hd);
-void java_highlighter(char *src, UcxBuffer *dest, HighlighterData *hd);
+void c2html_plain_highlighter(C2HTML_HIGHLIGHTER_SIGNATURE);
+void c2html_c_highlighter(C2HTML_HIGHLIGHTER_SIGNATURE);
+void c2html_java_highlighter(C2HTML_HIGHLIGHTER_SIGNATURE);
 
 #ifdef	__cplusplus
 }