Fix more issues with headers

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

14 files changed, 7 insertions, 31 deletions

diff --git a/include/gnunet/gnunet_chat_lib.h b/include/gnunet/gnunet_chat_lib.h
index 1f94391..d6ad718 100644
--- a/include/gnunet/gnunet_chat_lib.h
+++ b/include/gnunet/gnunet_chat_lib.h
@@ -34,9 +34,6 @@
  */
 /**@{*/
 
-#include <gnunet/platform.h>
-#include <gnunet/gnunet_common.h>
-#include <gnunet/gnunet_time_lib.h>
 #include <gnunet/gnunet_util_lib.h>
 
 /**
diff --git a/src/gnunet_chat_account.h b/src/gnunet_chat_account.h
index 45ca869..25d7598 100644
--- a/src/gnunet_chat_account.h
+++ b/src/gnunet_chat_account.h
@@ -25,9 +25,8 @@
 #ifndef GNUNET_CHAT_ACCOUNT_H_
 #define GNUNET_CHAT_ACCOUNT_H_
 
-#include <gnunet/platform.h>
-#include <gnunet/gnunet_common.h>
 #include <gnunet/gnunet_identity_service.h>
+#include <gnunet/gnunet_util_lib.h>
 
 struct GNUNET_CHAT_Account
 {
diff --git a/src/gnunet_chat_contact.h b/src/gnunet_chat_contact.h
index 54918cc..41b793c 100644
--- a/src/gnunet_chat_contact.h
+++ b/src/gnunet_chat_contact.h
@@ -25,8 +25,6 @@
 #ifndef GNUNET_CHAT_CONTACT_H_
 #define GNUNET_CHAT_CONTACT_H_
 
-#include <gnunet/platform.h>
-#include <gnunet/gnunet_common.h>
 #include <gnunet/gnunet_messenger_service.h>
 #include <gnunet/gnunet_util_lib.h>
 
diff --git a/src/gnunet_chat_context.h b/src/gnunet_chat_context.h
index 3b6e1bb..6d192dd 100644
--- a/src/gnunet_chat_context.h
+++ b/src/gnunet_chat_context.h
@@ -25,9 +25,6 @@
 #ifndef GNUNET_CHAT_CONTEXT_H_
 #define GNUNET_CHAT_CONTEXT_H_
 
-#include <gnunet/platform.h>
-#include <gnunet/gnunet_common.h>
-#include <gnunet/gnunet_configuration_lib.h>
 #include <gnunet/gnunet_gnsrecord_lib.h>
 #include <gnunet/gnunet_messenger_service.h>
 #include <gnunet/gnunet_util_lib.h>
diff --git a/src/gnunet_chat_file.h b/src/gnunet_chat_file.h
index 4a6bcd3..f41852c 100644
--- a/src/gnunet_chat_file.h
+++ b/src/gnunet_chat_file.h
@@ -25,8 +25,6 @@
 #ifndef GNUNET_CHAT_FILE_H_
 #define GNUNET_CHAT_FILE_H_
 
-#include <gnunet/platform.h>
-#include <gnunet/gnunet_common.h>
 #include <gnunet/gnunet_fs_service.h>
 #include <gnunet/gnunet_messenger_service.h>
 #include <gnunet/gnunet_util_lib.h>
diff --git a/src/gnunet_chat_group.h b/src/gnunet_chat_group.h
index e3f7b6d..a48fb2f 100644
--- a/src/gnunet_chat_group.h
+++ b/src/gnunet_chat_group.h
@@ -25,8 +25,6 @@
 #ifndef GNUNET_CHAT_GROUP_H_
 #define GNUNET_CHAT_GROUP_H_
 
-#include <gnunet/platform.h>
-#include <gnunet/gnunet_common.h>
 #include <gnunet/gnunet_regex_service.h>
 #include <gnunet/gnunet_util_lib.h>
 
diff --git a/src/gnunet_chat_handle.h b/src/gnunet_chat_handle.h
index 100140b..0ceb40f 100644
--- a/src/gnunet_chat_handle.h
+++ b/src/gnunet_chat_handle.h
@@ -25,9 +25,6 @@
 #ifndef GNUNET_CHAT_HANDLE_H_
 #define GNUNET_CHAT_HANDLE_H_
 
-#include <gnunet/platform.h>
-#include <gnunet/gnunet_common.h>
-#include <gnunet/gnunet_config.h>
 #include <gnunet/gnunet_arm_service.h>
 #include <gnunet/gnunet_fs_service.h>
 #include <gnunet/gnunet_gns_service.h>
diff --git a/src/gnunet_chat_invitation.h b/src/gnunet_chat_invitation.h
index ff5ebc7..73bd886 100644
--- a/src/gnunet_chat_invitation.h
+++ b/src/gnunet_chat_invitation.h
@@ -25,8 +25,6 @@
 #ifndef GNUNET_CHAT_INVITATION_H_
 #define GNUNET_CHAT_INVITATION_H_
 
-#include <gnunet/platform.h>
-#include <gnunet/gnunet_common.h>
 #include <gnunet/gnunet_messenger_service.h>
 #include <gnunet/gnunet_util_lib.h>
 
diff --git a/src/gnunet_chat_lib.c b/src/gnunet_chat_lib.c
index 640f70e..111bfd8 100644
--- a/src/gnunet_chat_lib.c
+++ b/src/gnunet_chat_lib.c
@@ -24,9 +24,12 @@
 
 #include "gnunet_chat_lib.h"
 
+#include <libgen.h>
 #include <limits.h>
 #include <strings.h>
 
+#define _(String) ((const char*) String)
+
 #include "gnunet_chat_contact.h"
 #include "gnunet_chat_context.h"
 #include "gnunet_chat_file.h"
diff --git a/src/gnunet_chat_lobby.h b/src/gnunet_chat_lobby.h
index 3a55b42..c1194bc 100644
--- a/src/gnunet_chat_lobby.h
+++ b/src/gnunet_chat_lobby.h
@@ -25,8 +25,6 @@
 #ifndef GNUNET_CHAT_LOBBY_H_
 #define GNUNET_CHAT_LOBBY_H_
 
-#include <gnunet/platform.h>
-#include <gnunet/gnunet_common.h>
 #include <gnunet/gnunet_identity_service.h>
 #include <gnunet/gnunet_util_lib.h>
 
diff --git a/src/gnunet_chat_message.h b/src/gnunet_chat_message.h
index 3ea7283..68b4697 100644
--- a/src/gnunet_chat_message.h
+++ b/src/gnunet_chat_message.h
@@ -25,8 +25,6 @@
 #ifndef GNUNET_CHAT_MESSAGE_H_
 #define GNUNET_CHAT_MESSAGE_H_
 
-#include <gnunet/platform.h>
-#include <gnunet/gnunet_common.h>
 #include <gnunet/gnunet_messenger_service.h>
 #include <gnunet/gnunet_util_lib.h>
 
diff --git a/src/gnunet_chat_uri.h b/src/gnunet_chat_uri.h
index a79f02a..ee533b5 100644
--- a/src/gnunet_chat_uri.h
+++ b/src/gnunet_chat_uri.h
@@ -25,8 +25,6 @@
 #ifndef GNUNET_CHAT_URI_H_
 #define GNUNET_CHAT_URI_H_
 
-#include <gnunet/platform.h>
-#include <gnunet/gnunet_common.h>
 #include <gnunet/gnunet_identity_service.h>
 #include <gnunet/gnunet_util_lib.h>
 
diff --git a/src/gnunet_chat_util.c b/src/gnunet_chat_util.c
index a017b26..bdc5e18 100644
--- a/src/gnunet_chat_util.c
+++ b/src/gnunet_chat_util.c
@@ -24,6 +24,7 @@
 
 #include "gnunet_chat_util.h"
 
+
 void
 util_shorthash_from_member (const struct GNUNET_MESSENGER_Contact *member,
                             struct GNUNET_ShortHashCode *shorthash)
@@ -268,9 +269,8 @@ util_get_dirname (const char *directory,
 
   return GNUNET_asprintf (
       filename,
-      "%s%c%s",
+      "%s/%s",
       directory,
-      DIR_SEPARATOR,
       subdir
   );
 }
@@ -291,9 +291,8 @@ util_get_filename (const char *directory,
 
   int result = GNUNET_asprintf (
       filename,
-      "%s%c%s",
+      "%s/%s",
       dirname,
-      DIR_SEPARATOR,
       GNUNET_h2s_full(hash)
   );
 
diff --git a/src/gnunet_chat_util.h b/src/gnunet_chat_util.h
index 80cd81b..9e22439 100644
--- a/src/gnunet_chat_util.h
+++ b/src/gnunet_chat_util.h
@@ -25,8 +25,6 @@
 #ifndef GNUNET_CHAT_UTIL_H_
 #define GNUNET_CHAT_UTIL_H_
 
-#include <gnunet/platform.h>
-#include <gnunet/gnunet_common.h>
 #include <gnunet/gnunet_messenger_service.h>
 #include <gnunet/gnunet_util_lib.h>