lib: Fix header inclusion

This fixes wrong header inclusion that would make programs which are
not developed within ouroboros fail upon compilation, since they would
not find certain headers on their system.

6 files changed, 28 insertions, 26 deletions

diff --git a/include/ouroboros/CMakeLists.txt b/include/ouroboros/CMakeLists.txt
index 5ce99c4c..6e49ee04 100644
--- a/include/ouroboros/CMakeLists.txt
+++ b/include/ouroboros/CMakeLists.txt
@@ -8,9 +8,9 @@ set(HEADER_FILES
         dev.h
         dif_config.h
         flow.h
+        instance_name.h
         irm.h
         qos.h
 )
 
-install(FILES ${HEADER_FILES} "${CMAKE_CURRENT_BINARY_DIR}/config.h"
-        DESTINATION include/ouroboros)
+install(FILES ${HEADER_FILES} DESTINATION include/ouroboros)
diff --git a/include/ouroboros/cdap.h b/include/ouroboros/cdap.h
index f1abeff5..72788ad6 100644
--- a/include/ouroboros/cdap.h
+++ b/include/ouroboros/cdap.h
@@ -23,81 +23,80 @@
 #ifndef OUROBOROS_CDAP_H
 #define OUROBOROS_CDAP_H
 
-#include "common.h"
 #include <stdbool.h>
 
 struct cdap;
 
 struct cdap_ops {
         /* Sender related callbacks */
-        int (* handle_connect_r)(port_id_t id,
+        int (* handle_connect_r)(int fd,
                                  int invoke_id,
                                  int result);
-        int (* handle_release_r)(port_id_t id,
+        int (* handle_release_r)(int fd,
                                  int invoke_id,
                                  int result);
-        int (* handle_read_r)(port_id_t id,
+        int (* handle_read_r)(int fd,
                               int invoke_id,
                               int result,
                               char * reason,
                               char * obj_val,
                               bool complete);
-        int (* handle_cancelread_r)(port_id_t id,
+        int (* handle_cancelread_r)(int fd,
                                     int invoke_id,
                                     int result);
-        int (* handle_write_r)(port_id_t id,
+        int (* handle_write_r)(int fd,
                                int invoke_id,
                                int result,
                                char * reason,
                                char * obj_val);
-        int (* handle_create_r)(port_id_t id,
+        int (* handle_create_r)(int fd,
                                 int invoke_id,
                                 int result);
-        int (* handle_delete_r)(port_id_t id,
+        int (* handle_delete_r)(int fd,
                                 int invoke_id,
                                 int result);
-        int (* handle_start_r)(port_id_t id,
+        int (* handle_start_r)(int fd,
                                int invoke_id,
                                int result);
-        int (* handle_stop_r)(port_id_t id,
+        int (* handle_stop_r)(int fd,
                               int invoke_id,
                               int result);
 
         /* Receiver related callbacks */
-        int (* handle_connect)(port_id_t id,
+        int (* handle_connect)(int fd,
                                int invoke_id,
                                rina_name_t src,
                                rina_name_t dst,
                                char * auth_mech,
                                char * auth_val);
-        int (* handle_release)(port_id_t id,
+        int (* handle_release)(int fd,
                                int invoke_id);
-        int (* handle_cancelread)(port_id_t id,
+        int (* handle_cancelread)(int fd,
                                   int invoke_id);
-        int (* handle_write)(port_id_t id,
+        int (* handle_write)(int fd,
                              int invoke_id,
                              char * obj_name,
                              char * obj_val);
-        int (* handle_create)(port_id_t id,
+        int (* handle_create)(int fd,
                               int invoke_id,
                               char * obj_class,
                               char * obj_name,
                               char * obj_val);
-        int (* handle_delete)(port_id_t id,
+        int (* handle_delete)(int fd,
                               int invoke_id,
                               char * obj_name);
-        int (* handle_start)(port_id_t id,
+        int (* handle_start)(int fd,
                              int invoke_id,
                              char * obj_name,
                              char * obj_val);
-        int (* handle_stop)(port_id_t id,
+        int (* handle_stop)(int fd,
                             int invoke_id,
                             char * obj_name,
                             char * obj_val);
 };
 
 struct cdap * cdap_create(struct cdap_ops ops,
-                          port_id_t id);
+                          int fd);
 int           cdap_destroy(struct cdap * instance);
 
 /* Sender related functions */
diff --git a/include/ouroboros/da.h b/include/ouroboros/da.h
index 9ecd4bd8..406be7a8 100644
--- a/include/ouroboros/da.h
+++ b/include/ouroboros/da.h
@@ -23,8 +23,8 @@
 #ifndef OUROBOROS_DA_H
 #define OUROBOROS_DA_H
 
-#include "common.h"
-#include "instance_name.h"
+#include <stdint.h>
+#include <unistd.h>
 
 char *  da_resolve_daf(char * daf_name);
 /*
diff --git a/include/ouroboros/dif_config.h b/include/ouroboros/dif_config.h
index 5d489b0c..d76d4f68 100644
--- a/include/ouroboros/dif_config.h
+++ b/include/ouroboros/dif_config.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <ouroboros/utils.h>
-#include <ouroboros/common.h>
+#include <stdint.h>
+#include <unistd.h>
 
 #ifndef OUROBOROS_DIF_CONFIG_H
 #define OUROBOROS_DIF_CONFIG_H
diff --git a/include/ouroboros/instance_name.h b/include/ouroboros/instance_name.h
index 351b222f..92681504 100644
--- a/include/ouroboros/instance_name.h
+++ b/include/ouroboros/instance_name.h
@@ -22,7 +22,9 @@
 #ifndef INSTANCE_NAME_H
 #define INSTANCE_NAME_H
 
-#include "common.h"
+#include <stdint.h>
+#include <unistd.h>
+#include <stdbool.h>
 
 typedef struct {
         char *   name;
diff --git a/src/ipcpd/ipcp-ops.h b/src/ipcpd/ipcp-ops.h
index 1365f9b6..a766c3ae 100644
--- a/src/ipcpd/ipcp-ops.h
+++ b/src/ipcpd/ipcp-ops.h
@@ -25,6 +25,7 @@
 #define IPCPD_IPCP_OPS_H
 
 #include <ouroboros/dif_config.h>
+#include <ouroboros/common.h>
 #include <sys/types.h>
 
 struct ipcp_ops {