From dd9d49d5a99516957618f155ce1ecfd51678c586 Mon Sep 17 00:00:00 2001
From: Georg Hopp <georg@steffers.org>
Date: Fri, 23 Mar 2012 18:43:15 +0100
Subject: [PATCH] made all class and interface basics to a small lib. This is
 the first one. All other parts will become libs too. Right now these are only
 static libs but this way its easy to split them out if needed

---
 configure.ac                          |   2 +-
 include/class.h                       | 121 +------------------------
 include/class/class.h                 | 125 ++++++++++++++++++++++++++
 include/{ => class}/interface.h       |   6 +-
 include/{ => class}/interface/class.h |  10 +--
 include/interface/auth.h              |   2 +-
 include/interface/hashable.h          |   2 +-
 include/interface/logger.h            |   2 +-
 src/Makefile.am                       |   8 +-
 src/auth/ldap.c                       |   1 -
 src/cbuf.c                            |   1 -
 src/class/Makefile.am                 |   8 ++
 src/{ => class}/interface.c           |   2 +-
 src/{ => class}/interface/class.c     |   4 +-
 src/class/libclass.a                  | Bin 0 -> 17066 bytes
 src/credential.c                      |   1 -
 src/hash.c                            |   1 -
 src/hash/add.c                        |   2 +-
 src/hash_value.c                      |   2 +-
 src/http/cookie.c                     |   2 +-
 src/http/header.c                     |   1 -
 src/http/message.c                    |   1 -
 src/http/message/queue.c              |   1 -
 src/http/parser.c                     |   1 -
 src/http/parser/header.c              |   1 -
 src/http/parser/parse.c               |   2 +-
 src/http/parser/post_vars.c           |   2 +-
 src/http/parser/request_vars.c        |   2 +-
 src/http/request.c                    |   1 -
 src/http/response.c                   |   1 -
 src/http/response/304.c               |   1 -
 src/http/response/403.c               |   1 -
 src/http/response/404.c               |   1 -
 src/http/response/asset.c             |   1 -
 src/http/response/login_form.c        |   1 -
 src/http/response/randval.c           |   1 -
 src/http/response/session.c           |   1 -
 src/http/worker.c                     |   1 -
 src/http/worker/add_common_header.c   |   1 -
 src/http/worker/process.c             |   1 -
 src/http/writer.c                     |   1 -
 src/http/writer/write.c               |   1 -
 src/logger.c                          |   2 +-
 src/server.c                          |   1 -
 src/server/close_conn.c               |   2 +-
 src/server/handle_accept.c            |   2 +-
 src/session.c                         |   1 -
 src/session/add.c                     |   2 +-
 src/session/delete.c                  |   2 +-
 src/socket.c                          |   2 +-
 src/socket/accept.c                   |   2 +-
 src/socket/connect.c                  |   2 +-
 src/socket/listen.c                   |   2 +-
 src/stream.c                          |   1 -
 src/taskrambler.c                     |   2 +-
 src/utils/http.c                      |   2 +-
 56 files changed, 173 insertions(+), 179 deletions(-)
 create mode 100644 include/class/class.h
 rename include/{ => class}/interface.h (95%)
 rename include/{ => class}/interface/class.h (90%)
 create mode 100644 src/class/Makefile.am
 rename src/{ => class}/interface.c (98%)
 rename src/{ => class}/interface/class.c (96%)
 create mode 100644 src/class/libclass.a

diff --git a/configure.ac b/configure.ac
index f526f52..1cc1e30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,5 +38,5 @@ AC_TYPE_SIZE_T
 #AC_FUNC_MALLOC
 AC_CHECK_FUNCS([memset])
 
-AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile src/class/Makefile tests/Makefile])
 AC_OUTPUT
diff --git a/include/class.h b/include/class.h
index d08e85f..6c07bbc 100644
--- a/include/class.h
+++ b/include/class.h
@@ -1,124 +1,9 @@
-/**
- * \file
- * My own class implementation for C. It combines a data structure
- * with a set of dynamically linked methods defined by an interface. A
- * dynamically linked method will be called via a selector method which in
- * turn gets the implementation stored in the class.
- *
- * \author	Georg Hopp
- *
- * \copyright
- * Copyright © 2012  Georg Hopp
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 #ifndef __CLASS_H__
 #define __CLASS_H__
 
-#include <stdarg.h>
-#include <sys/types.h>
-#include <string.h>
-#include <assert.h>
-
-#include "interface.h"
-
-#ifndef _ISOC99_SOURCE
-#define _ISOC99_SOURCE
-#endif
-
-#define CLASS_MAGIC    0xFEFE
-
-#define CLASS(name)                      \
-	struct c_##name;                     \
-	typedef struct c_##name * name;      \
-	extern struct class * const _##name; \
-	struct c_##name
-
-#define EXTENDS(parent) \
-	const char _[sizeof(struct c_##parent)]
-
-#define _NULL	NULL
-#define CREATE_CLASS(name,_parent,...)      \
-	static struct class c_##name;           \
-	static class_ptr _classInit_(void) {    \
-		c_##name.parent = _##_parent;       \
-		c_##name.init   = NULL;             \
-		return &c_##name;                   \
-	}                                       \
-	static struct class c_##name = {        \
-		CLASS_MAGIC,                        \
-		NULL,                               \
-		sizeof(struct c_##name),            \
-		_classInit_,                        \
-		INIT_IFACE_IMPL(__VA_ARGS__)        \
-	}; struct class * const _##name = &c_##name
-
-#define INIT_CLASS(class)			((class)->init? (class)->init() : (class))
-#define GET_CLASS(object)			(INIT_CLASS(*(class_ptr *)((object) - sizeof(void*))))
-#define IFACE_GET(class,iface)		(interfaceGet(&((class)->impl),(iface)))
-#define HAS_PARENT(class)			(NULL != ((class)->parent) &&  INIT_CLASS((class)->parent))
-
-/**
- * \todo actually i use gcc feature ## for variadoc... think about
- * a way to make this standard.
- */
-#define _CALL(_class,_iface,method,...)                                         \
-	do {                                                                        \
-		class_ptr class = _class;                                               \
-		iface = (struct i_##_iface *)IFACE_GET(class, &i_##_iface);             \
-		while ((NULL == iface || NULL == iface->method) && HAS_PARENT(class)) { \
-			class = class->parent;                                              \
-			iface = (struct i_##_iface *)IFACE_GET(class, &i_##_iface);         \
-		}                                                                       \
-		assert(NULL != iface->method);                                          \
-	} while(0)
-
-#define CALL(object,_iface,method,...)                           \
-	do {                                                         \
-		struct i_##_iface * iface;                               \
-		_CALL(GET_CLASS(object), _iface, method, ##__VA_ARGS__); \
-		iface->method(object, ##__VA_ARGS__);                    \
-	} while(0)
-
-#define RETCALL(object,_iface,method,ret,...)                    \
-	do {                                                         \
-		struct i_##_iface * iface;                               \
-		_CALL(GET_CLASS(object), _iface, method, ##__VA_ARGS__); \
-		ret = iface->method(object, ##__VA_ARGS__);              \
-	} while(0)
-
-#define PARENTCALL(object,_iface,method,...)                    \
-	do {                                                        \
-		struct i_##_iface * iface;                              \
-		class_ptr pc_class = GET_CLASS((object));               \
-		assert(HAS_PARENT(pc_class));                           \
-		_CALL(pc_class->parent, _iface, method, ##__VA_ARGS__); \
-		iface->method(object, ##__VA_ARGS__);                   \
-	} while(0)
-
-
-struct class;
-typedef struct class * class_ptr;
-typedef class_ptr (* fptr_classInit)(void);
-struct class {
-	const int         magic;
-	class_ptr         parent;
-	size_t            object_size;
-	fptr_classInit    init;
-	struct iface_impl impl;
-};
+#include "class/class.h"
+#include "class/interface.h"
+#include "class/interface/class.h"
 
 #endif // __CLASS_H__
 
diff --git a/include/class/class.h b/include/class/class.h
new file mode 100644
index 0000000..1b6fd79
--- /dev/null
+++ b/include/class/class.h
@@ -0,0 +1,125 @@
+/**
+ * \file
+ * My own class implementation for C. It combines a data structure
+ * with a set of dynamically linked methods defined by an interface. A
+ * dynamically linked method will be called via a selector method which in
+ * turn gets the implementation stored in the class.
+ *
+ * \author	Georg Hopp
+ *
+ * \copyright
+ * Copyright © 2012  Georg Hopp
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __CLASS_CLASS_H__
+#define __CLASS_CLASS_H__
+
+#include <stdarg.h>
+#include <sys/types.h>
+#include <string.h>
+#include <assert.h>
+
+#include "class/interface.h"
+
+#ifndef _ISOC99_SOURCE
+#define _ISOC99_SOURCE
+#endif
+
+#define CLASS_MAGIC    0xFEFE
+
+#define CLASS(name)                      \
+	struct c_##name;                     \
+	typedef struct c_##name * name;      \
+	extern struct class * const _##name; \
+	struct c_##name
+
+#define EXTENDS(parent) \
+	const char _[sizeof(struct c_##parent)]
+
+#define _NULL	NULL
+#define CREATE_CLASS(name,_parent,...)      \
+	static struct class c_##name;           \
+	static class_ptr _classInit_(void) {    \
+		c_##name.parent = _##_parent;       \
+		c_##name.init   = NULL;             \
+		return &c_##name;                   \
+	}                                       \
+	static struct class c_##name = {        \
+		CLASS_MAGIC,                        \
+		NULL,                               \
+		sizeof(struct c_##name),            \
+		_classInit_,                        \
+		INIT_IFACE_IMPL(__VA_ARGS__)        \
+	}; struct class * const _##name = &c_##name
+
+#define INIT_CLASS(class)			((class)->init? (class)->init() : (class))
+#define GET_CLASS(object)			(INIT_CLASS(*(class_ptr *)((object) - sizeof(void*))))
+#define IFACE_GET(class,iface)		(interfaceGet(&((class)->impl),(iface)))
+#define HAS_PARENT(class)			(NULL != ((class)->parent) &&  INIT_CLASS((class)->parent))
+
+/**
+ * \todo actually i use gcc feature ## for variadoc... think about
+ * a way to make this standard.
+ */
+#define _CALL(_class,_iface,method,...)                                         \
+	do {                                                                        \
+		class_ptr class = _class;                                               \
+		iface = (struct i_##_iface *)IFACE_GET(class, &i_##_iface);             \
+		while ((NULL == iface || NULL == iface->method) && HAS_PARENT(class)) { \
+			class = class->parent;                                              \
+			iface = (struct i_##_iface *)IFACE_GET(class, &i_##_iface);         \
+		}                                                                       \
+		assert(NULL != iface->method);                                          \
+	} while(0)
+
+#define CALL(object,_iface,method,...)                           \
+	do {                                                         \
+		struct i_##_iface * iface;                               \
+		_CALL(GET_CLASS(object), _iface, method, ##__VA_ARGS__); \
+		iface->method(object, ##__VA_ARGS__);                    \
+	} while(0)
+
+#define RETCALL(object,_iface,method,ret,...)                    \
+	do {                                                         \
+		struct i_##_iface * iface;                               \
+		_CALL(GET_CLASS(object), _iface, method, ##__VA_ARGS__); \
+		ret = iface->method(object, ##__VA_ARGS__);              \
+	} while(0)
+
+#define PARENTCALL(object,_iface,method,...)                    \
+	do {                                                        \
+		struct i_##_iface * iface;                              \
+		class_ptr pc_class = GET_CLASS((object));               \
+		assert(HAS_PARENT(pc_class));                           \
+		_CALL(pc_class->parent, _iface, method, ##__VA_ARGS__); \
+		iface->method(object, ##__VA_ARGS__);                   \
+	} while(0)
+
+
+struct class;
+typedef struct class * class_ptr;
+typedef class_ptr (* fptr_classInit)(void);
+struct class {
+	const int         magic;
+	class_ptr         parent;
+	size_t            object_size;
+	fptr_classInit    init;
+	struct iface_impl impl;
+};
+
+#endif // __CLASS_CLASS_H__
+
+// vim: set ts=4 sw=4:
diff --git a/include/interface.h b/include/class/interface.h
similarity index 95%
rename from include/interface.h
rename to include/class/interface.h
index 34c3fcb..941f43c 100644
--- a/include/interface.h
+++ b/include/class/interface.h
@@ -24,8 +24,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __INTERFACE_H__
-#define __INTERFACE_H__
+#ifndef __CLASS_INTERFACE_H__
+#define __CLASS_INTERFACE_H__
 
 #include <sys/types.h>
 
@@ -54,6 +54,6 @@ typedef struct iface_impl * iface_impl_ptr;
 
 extern iface_ptr interfaceGet(iface_impl_ptr, const iface_ptr);
 
-#endif // __INTERFACE_H__
+#endif // __CLASS_INTERFACE_H__
 
 // vim: set ts=4 sw=4:
diff --git a/include/interface/class.h b/include/class/interface/class.h
similarity index 90%
rename from include/interface/class.h
rename to include/class/interface/class.h
index b0fd2ad..98cbdbd 100644
--- a/include/interface/class.h
+++ b/include/class/interface/class.h
@@ -23,13 +23,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __INTERFACE_CLASS_H__
-#define __INTERFACE_CLASS_H__
+#ifndef __CLASS_INTERFACE_CLASS_H__
+#define __CLASS_INTERFACE_CLASS_H__
 
 #include <stdarg.h>
 
-#include "class.h"
-#include "interface.h"
+#include "class/class.h"
+#include "class/interface.h"
 
 typedef int  (* fptr_ctor)(void *, va_list *);
 typedef void (* fptr_dtor)(void *);
@@ -52,6 +52,6 @@ extern void * classClone(void *);
 #define delete(object)		classDelete((void **)&(object))
 #define clone(object)		classClone((void *)(object))
 
-#endif // __INTERFACE_CLASS_H__
+#endif // __CLASS_INTERFACE_CLASS_H__
 
 // vim: set ts=4 sw=4:
diff --git a/include/interface/auth.h b/include/interface/auth.h
index ed552e7..ec55000 100644
--- a/include/interface/auth.h
+++ b/include/interface/auth.h
@@ -30,7 +30,7 @@
 
 #include <stdarg.h>
 
-#include "interface.h"
+#include "class.h"
 #include "credential.h"
 
 typedef int (* fptr_authenticate)(void *, Credential);
diff --git a/include/interface/hashable.h b/include/interface/hashable.h
index 18b9ae3..a4dbc49 100644
--- a/include/interface/hashable.h
+++ b/include/interface/hashable.h
@@ -24,7 +24,7 @@
 #ifndef __INTERFACE_HASHABLE_H__
 #define __INTERFACE_HASHABLE_H__
 
-#include "interface.h"
+#include "class.h"
 
 typedef unsigned long (* fptr_hashableGetHash)(void *);
 typedef void          (* fptr_hashableHandleDouble)(void *, void *);
diff --git a/include/interface/logger.h b/include/interface/logger.h
index c55876c..9f02f02 100644
--- a/include/interface/logger.h
+++ b/include/interface/logger.h
@@ -26,7 +26,7 @@
 
 #include <stdarg.h>
 
-#include "interface.h"
+#include "class.h"
 #include "logger.h"
 
 typedef void (* fptr_log)(void *, logger_level, const char * const);
diff --git a/src/Makefile.am b/src/Makefile.am
index de4d510..3386774 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,8 @@
 ACLOCAL_AMFLAGS = -I m4
 
-IFACE   = interface/class.c interface/stream_reader.c interface/logger.c \
+IFACE   = interface/stream_reader.c interface/logger.c \
           interface/stream_writer.c interface/http_intro.c \
-          interface/subject.c interface/observer.c interface.c
+          interface/subject.c interface/observer.c
 SOCKET  = socket.c socket/accept.c socket/connect.c socket/listen.c
 STREAM  = stream.c stream/read.c stream/write.c
 HASH    = hash.c hash/add.c hash/get.c hash/delete.c \
@@ -67,4 +67,6 @@ taskrambler_SOURCES = taskrambler.c \
 			$(WRITER) $(RESP) $(HEADER) $(PARSER) $(WORKER) $(CB) \
 			$(UTILS) $(MSGQ) $(SESSION) $(STREAM) $(HASH) $(AUTH)
 taskrambler_CFLAGS  = -Wall -I ../include/
-taskrambler_LDFLAGS = -lrt -lssl -lldap
+taskrambler_LDFLAGS = -L./class -lclass -lrt -lssl -lldap
+
+SUBDIRS = class
diff --git a/src/auth/ldap.c b/src/auth/ldap.c
index fb7bf0e..28f37d2 100644
--- a/src/auth/ldap.c
+++ b/src/auth/ldap.c
@@ -29,7 +29,6 @@
 #include "auth/ldap.h"
 #include "class.h"
 #include "credential.h"
-#include "interface/class.h"
 #include "interface/auth.h"
 
 #include "utils/memory.h"
diff --git a/src/cbuf.c b/src/cbuf.c
index fdf77db..0ee216d 100644
--- a/src/cbuf.c
+++ b/src/cbuf.c
@@ -34,7 +34,6 @@
 #include <fcntl.h>
 
 #include "class.h"
-#include "interface/class.h"
 #include "utils/memory.h"
 
 #include "cbuf.h"
diff --git a/src/class/Makefile.am b/src/class/Makefile.am
new file mode 100644
index 0000000..c457e13
--- /dev/null
+++ b/src/class/Makefile.am
@@ -0,0 +1,8 @@
+ACLOCAL_AMFLAGS = -I m4
+
+AM_CFLAGS = -Wall -I ../include/
+
+noinst_LIBRARIES = libclass.a
+
+libclass_a_SOURCES = interface.c interface/class.c
+libclass_a_CFLAGS  = -Wall -I ../../include/
diff --git a/src/interface.c b/src/class/interface.c
similarity index 98%
rename from src/interface.c
rename to src/class/interface.c
index 9d4d6b9..661561b 100644
--- a/src/interface.c
+++ b/src/class/interface.c
@@ -23,7 +23,7 @@
 #include <sys/types.h>
 #include <stdlib.h>
 
-#include "interface.h"
+#include "class/interface.h"
 #include "commons.h"
 
 static
diff --git a/src/interface/class.c b/src/class/interface/class.c
similarity index 96%
rename from src/interface/class.c
rename to src/class/interface/class.c
index cfdcf83..0113902 100644
--- a/src/interface/class.c
+++ b/src/class/interface/class.c
@@ -24,8 +24,8 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "class.h"
-#include "interface/class.h"
+#include "class/class.h"
+#include "class/interface/class.h"
 
 const
 struct interface i_Class = {
diff --git a/src/class/libclass.a b/src/class/libclass.a
new file mode 100644
index 0000000000000000000000000000000000000000..0892538f9b6bf8d214f987289b3e4672f2a91c29
GIT binary patch
literal 17066
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
DkHC$E

literal 0
HcmV?d00001

diff --git a/src/credential.c b/src/credential.c
index 873877b..663cfe2 100644
--- a/src/credential.c
+++ b/src/credential.c
@@ -27,7 +27,6 @@
 
 #include "credential.h"
 #include "class.h"
-#include "interface/class.h"
 
 #include "utils/memory.h"
 
diff --git a/src/hash.c b/src/hash.c
index 8956144..bb2fb7a 100644
--- a/src/hash.c
+++ b/src/hash.c
@@ -27,7 +27,6 @@
 
 #include "hash.h"
 #include "class.h"
-#include "interface/class.h"
 
 static
 int
diff --git a/src/hash/add.c b/src/hash/add.c
index 5226862..32e9101 100644
--- a/src/hash/add.c
+++ b/src/hash/add.c
@@ -24,7 +24,7 @@
 
 #include "hash.h"
 #include "interface/hashable.h"
-#include "interface/class.h"
+#include "class.h"
 
 static
 inline
diff --git a/src/hash_value.c b/src/hash_value.c
index c69a169..0df0ecb 100644
--- a/src/hash_value.c
+++ b/src/hash_value.c
@@ -29,7 +29,7 @@
 #include "utils/hash.h"
 #include "utils/memory.h"
 #include "commons.h"
-#include "interface/class.h"
+#include "class.h"
 #include "interface/hashable.h"
 
 static
diff --git a/src/http/cookie.c b/src/http/cookie.c
index 412f463..29ca5a7 100644
--- a/src/http/cookie.c
+++ b/src/http/cookie.c
@@ -26,7 +26,7 @@
 #include <sys/types.h>
 
 #include "cookie.h"
-#include "interface/class.h"
+#include "class.h"
 #include "interface/hashable"
 
 #include "utils/hash.h"
diff --git a/src/http/header.c b/src/http/header.c
index 999b878..8067569 100644
--- a/src/http/header.c
+++ b/src/http/header.c
@@ -25,7 +25,6 @@
 #include <string.h>
 
 #include "class.h"
-#include "interface/class.h"
 #include "http/header.h"
 #include "interface/hashable.h"
 
diff --git a/src/http/message.c b/src/http/message.c
index 611f9de..663d710 100644
--- a/src/http/message.c
+++ b/src/http/message.c
@@ -31,7 +31,6 @@
 #include <unistd.h>
 
 #include "class.h"
-#include "interface/class.h"
 #include "hash.h"
 #include "http/message.h"
 #include "utils/memory.h"
diff --git a/src/http/message/queue.c b/src/http/message/queue.c
index ceb4496..72dcf34 100644
--- a/src/http/message/queue.c
+++ b/src/http/message/queue.c
@@ -23,7 +23,6 @@
 #include <stdarg.h>
 
 #include "class.h"
-#include "interface/class.h"
 
 #include "http/message/queue.h"
 
diff --git a/src/http/parser.c b/src/http/parser.c
index be34cce..28e57c8 100644
--- a/src/http/parser.c
+++ b/src/http/parser.c
@@ -25,7 +25,6 @@
 #include <stdarg.h>
 
 #include "class.h"
-#include "interface/class.h"
 #include "interface/stream_reader.h"
 
 #include "http/parser.h"
diff --git a/src/http/parser/header.c b/src/http/parser/header.c
index 0944305..4f226f3 100644
--- a/src/http/parser/header.c
+++ b/src/http/parser/header.c
@@ -25,7 +25,6 @@
 #include <sys/types.h>
 
 #include "class.h"
-#include "interface/class.h"
 #include "http/header.h"
 #include "http/parser.h"
 #include "http/message.h"
diff --git a/src/http/parser/parse.c b/src/http/parser/parse.c
index 397c352..f392ede 100644
--- a/src/http/parser/parse.c
+++ b/src/http/parser/parse.c
@@ -24,7 +24,7 @@
 
 #include "http/parser.h"
 #include "http/header.h"
-#include "interface/class.h"
+#include "class.h"
 #include "interface/http_intro.h"
 #include "cbuf.h"
 #include "stream.h"
diff --git a/src/http/parser/post_vars.c b/src/http/parser/post_vars.c
index 517133f..fe01658 100644
--- a/src/http/parser/post_vars.c
+++ b/src/http/parser/post_vars.c
@@ -27,7 +27,7 @@
 #include "http/request.h"
 #include "hash_value.h"
 #include "hash.h"
-#include "interface/class.h"
+#include "class.h"
 
 /**
  * \todo this is very similar to other pair parsing
diff --git a/src/http/parser/request_vars.c b/src/http/parser/request_vars.c
index d0b47a1..cb82a08 100644
--- a/src/http/parser/request_vars.c
+++ b/src/http/parser/request_vars.c
@@ -28,7 +28,7 @@
 #include "http/request.h"
 #include "hash_value.h"
 #include "hash.h"
-#include "interface/class.h"
+#include "class.h"
 
 void
 httpParserRequestVars(HttpParser this)
diff --git a/src/http/request.c b/src/http/request.c
index 4cd4c14..097a62e 100644
--- a/src/http/request.c
+++ b/src/http/request.c
@@ -26,7 +26,6 @@
 #include <sys/types.h>
 
 #include "class.h"
-#include "interface/class.h"
 #include "interface/http_intro.h"
 
 #include "http/request.h"
diff --git a/src/http/response.c b/src/http/response.c
index a53cd0d..d1b9d45 100644
--- a/src/http/response.c
+++ b/src/http/response.c
@@ -27,7 +27,6 @@
 #include <stdio.h>
 
 #include "class.h"
-#include "interface/class.h"
 #include "interface/http_intro.h"
 
 #include "http/response.h"
diff --git a/src/http/response/304.c b/src/http/response/304.c
index a5ea639..81519a7 100644
--- a/src/http/response/304.c
+++ b/src/http/response/304.c
@@ -23,7 +23,6 @@
 #include <sys/types.h>
 
 #include "class.h"
-#include "interface/class.h"
 
 #include "http/response.h"
 #include "http/message.h"
diff --git a/src/http/response/403.c b/src/http/response/403.c
index 7256a3e..b1ef08f 100644
--- a/src/http/response/403.c
+++ b/src/http/response/403.c
@@ -26,7 +26,6 @@
 #include <sys/types.h>
 
 #include "class.h"
-#include "interface/class.h"
 
 #include "http/response.h"
 #include "http/message.h"
diff --git a/src/http/response/404.c b/src/http/response/404.c
index fd3fae3..1947de1 100644
--- a/src/http/response/404.c
+++ b/src/http/response/404.c
@@ -26,7 +26,6 @@
 #include <sys/types.h>
 
 #include "class.h"
-#include "interface/class.h"
 
 #include "http/response.h"
 #include "http/message.h"
diff --git a/src/http/response/asset.c b/src/http/response/asset.c
index 1ab4937..b0c58f2 100644
--- a/src/http/response/asset.c
+++ b/src/http/response/asset.c
@@ -28,7 +28,6 @@
 #include <sys/types.h>
 
 #include "class.h"
-#include "interface/class.h"
 #include "stream.h"
 
 #include "http/response.h"
diff --git a/src/http/response/login_form.c b/src/http/response/login_form.c
index e0e6374..f01063d 100644
--- a/src/http/response/login_form.c
+++ b/src/http/response/login_form.c
@@ -27,7 +27,6 @@
 #include <sys/types.h>
 
 #include "class.h"
-#include "interface/class.h"
 
 #include "http/response.h"
 #include "http/message.h"
diff --git a/src/http/response/randval.c b/src/http/response/randval.c
index d9eb0b7..b98449e 100644
--- a/src/http/response/randval.c
+++ b/src/http/response/randval.c
@@ -27,7 +27,6 @@
 #include <sys/types.h>
 
 #include "class.h"
-#include "interface/class.h"
 
 #include "http/response.h"
 #include "http/message.h"
diff --git a/src/http/response/session.c b/src/http/response/session.c
index 924fa87..396b6a6 100644
--- a/src/http/response/session.c
+++ b/src/http/response/session.c
@@ -27,7 +27,6 @@
 #include <sys/types.h>
 
 #include "class.h"
-#include "interface/class.h"
 
 #include "http/response.h"
 #include "http/message.h"
diff --git a/src/http/worker.c b/src/http/worker.c
index 5b8c36d..f64ccdb 100644
--- a/src/http/worker.c
+++ b/src/http/worker.c
@@ -34,7 +34,6 @@
 #include "http/parser.h"
 #include "http/writer.h"
 
-#include "interface/class.h"
 #include "interface/stream_reader.h"
 #include "interface/stream_writer.h"
 
diff --git a/src/http/worker/add_common_header.c b/src/http/worker/add_common_header.c
index 99472cf..981c4da 100644
--- a/src/http/worker/add_common_header.c
+++ b/src/http/worker/add_common_header.c
@@ -24,7 +24,6 @@
 #include <sys/types.h>
 
 #include "class.h"
-#include "interface/class.h"
 
 #include "http/message.h"
 #include "http/header.h"
diff --git a/src/http/worker/process.c b/src/http/worker/process.c
index 29ccbd7..60b22dd 100644
--- a/src/http/worker/process.c
+++ b/src/http/worker/process.c
@@ -28,7 +28,6 @@
 #include <sys/time.h>
 
 #include "class.h"
-#include "interface/class.h"
 #include "interface/auth.h"
 
 #include "http/worker.h"
diff --git a/src/http/writer.c b/src/http/writer.c
index a2f94ca..0c381e8 100644
--- a/src/http/writer.c
+++ b/src/http/writer.c
@@ -23,7 +23,6 @@
 #include <stdarg.h>
 
 #include "class.h"
-#include "interface/class.h"
 #include "interface/stream_writer.h"
 
 #include "http/message/queue.h"
diff --git a/src/http/writer/write.c b/src/http/writer/write.c
index 9639eea..5942242 100644
--- a/src/http/writer/write.c
+++ b/src/http/writer/write.c
@@ -24,7 +24,6 @@
 #include <sys/stat.h>
 
 #include "class.h"
-#include "interface/class.h"
 #include "http/message.h"
 #include "http/writer.h"
 #include "cbuf.h"
diff --git a/src/logger.c b/src/logger.c
index d7237fd..6519f95 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -23,7 +23,7 @@
 #include <stdarg.h>
 
 #include "logger.h"
-#include "interface/class.h"
+#include "class.h"
 #include "interface/logger.h"
 
 const
diff --git a/src/server.c b/src/server.c
index e01f044..5f43eb0 100644
--- a/src/server.c
+++ b/src/server.c
@@ -31,7 +31,6 @@
 #include "server.h"
 #include "socket.h"
 #include "logger.h"
-#include "interface/class.h"
 
 #include "utils/memory.h"
 
diff --git a/src/server/close_conn.c b/src/server/close_conn.c
index 7347669..33d2dd4 100644
--- a/src/server/close_conn.c
+++ b/src/server/close_conn.c
@@ -24,7 +24,7 @@
 #include <string.h>
 
 #include "server.h"
-#include "interface/class.h"
+#include "class.h"
 #include "stream.h"
 
 void
diff --git a/src/server/handle_accept.c b/src/server/handle_accept.c
index bd10a93..9e20aa1 100644
--- a/src/server/handle_accept.c
+++ b/src/server/handle_accept.c
@@ -28,7 +28,7 @@
 
 #include "http/worker.h"
 #include "server.h"
-#include "interface/class.h"
+#include "class.h"
 #include "interface/logger.h"
 #include "stream.h"
 
diff --git a/src/session.c b/src/session.c
index 6b205d0..b768da4 100644
--- a/src/session.c
+++ b/src/session.c
@@ -29,7 +29,6 @@
 
 #include "session.h"
 #include "class.h"
-#include "interface/class.h"
 
 #include "utils/hash.h"
 #include "utils/memory.h"
diff --git a/src/session/add.c b/src/session/add.c
index ae635eb..f6a9d2c 100644
--- a/src/session/add.c
+++ b/src/session/add.c
@@ -23,7 +23,7 @@
 #include <search.h>
 
 #include "session.h"
-#include "interface/class.h"
+#include "class.h"
 
 
 static
diff --git a/src/session/delete.c b/src/session/delete.c
index f8a8ba4..33d203d 100644
--- a/src/session/delete.c
+++ b/src/session/delete.c
@@ -23,7 +23,7 @@
 #include <search.h>
 
 #include "session.h"
-#include "interface/class.h"
+#include "class.h"
 
 
 static
diff --git a/src/socket.c b/src/socket.c
index f3e2a27..8f761d0 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -26,7 +26,7 @@
 
 #include "socket.h"
 #include "logger.h"
-#include "interface/class.h"
+#include "class.h"
 #include "interface/logger.h"
 
 static
diff --git a/src/socket/accept.c b/src/socket/accept.c
index a51cae5..f8b5a4e 100644
--- a/src/socket/accept.c
+++ b/src/socket/accept.c
@@ -24,7 +24,7 @@
 #include <unistd.h>
 
 #include "socket.h"
-#include "interface/class.h"
+#include "class.h"
 #include "interface/logger.h"
 
 Sock
diff --git a/src/socket/connect.c b/src/socket/connect.c
index 7e0d19b..04bab48 100644
--- a/src/socket/connect.c
+++ b/src/socket/connect.c
@@ -24,7 +24,7 @@
 #include <errno.h>      // for errno
 
 #include "socket.h"
-#include "interface/class.h"
+#include "class.h"
 #include "interface/logger.h"
 
 
diff --git a/src/socket/listen.c b/src/socket/listen.c
index 0e54132..418a1d0 100644
--- a/src/socket/listen.c
+++ b/src/socket/listen.c
@@ -24,7 +24,7 @@
 #include <errno.h>      // for errno
 
 #include "socket.h"
-#include "interface/class.h"
+#include "class.h"
 #include "interface/logger.h"
 
 
diff --git a/src/stream.c b/src/stream.c
index 3168d92..827a0c8 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -24,7 +24,6 @@
 #include <openssl/ssl.h>
 
 #include "class.h"
-#include "interface/class.h"
 #include "stream.h"
 
 
diff --git a/src/taskrambler.c b/src/taskrambler.c
index faf9888..9b731d5 100644
--- a/src/taskrambler.c
+++ b/src/taskrambler.c
@@ -40,7 +40,7 @@
 #include "http/worker.h"
 #include "auth/ldap.h"
 
-#include "interface/class.h"
+#include "class.h"
 #include "interface/logger.h"
 
 #include "utils/signalHandling.h"
diff --git a/src/utils/http.c b/src/utils/http.c
index 36ab048..e24ce9d 100644
--- a/src/utils/http.c
+++ b/src/utils/http.c
@@ -28,7 +28,7 @@
 #include "http/request.h"
 #include "http/response.h"
 
-#include "interface/class.h"
+#include "class.h"
 
 #include "commons.h"