priv: Move defines to the top.

include/libssh/priv.h

@@ -94,6 +94,8 @@
 
 # endif /* _MSC_VER */
 
+int gettimeofday(struct timeval *__p, void *__t);
+
 #else /* _WIN32 */
 
 #include <unistd.h>
@@ -112,11 +114,16 @@
 #define CLIENTBANNER2 "SSH-2.0-libssh-" SSH_STRINGIFY(LIBSSH_VERSION)
 #define KBDINT_MAX_PROMPT 256 /* more than openssh's :) */
 
+#ifndef __FUNCTION__
+#if defined(__SUNPRO_C)
+#define __FUNCTION__ __func__
+#endif
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
@@ -127,9 +134,6 @@ struct error_struct {
     char error_buffer[ERROR_BUFFERLEN];
 };
 
-/* TODO: remove that include */
-#include "libssh/wrapper.h"
-
 struct ssh_message_struct;
 struct ssh_common_struct;
 struct ssh_kex_struct;
@@ -220,17 +224,6 @@ int match_hostname(const char *host, const char *pattern, unsigned int len);
 
 int message_handle(ssh_session session, void *user, uint8_t type, ssh_buffer packet);
 
-/* misc.c */
-#ifdef _WIN32
-int gettimeofday(struct timeval *__p, void *__t);
-#endif /* _WIN32 */
-
-#ifndef __FUNCTION__
-#if defined(__SUNPRO_C)
-#define __FUNCTION__ __func__
-#endif
-#endif
-
 #define _enter_function(sess) \
 	do {\
 		if((sess)->common.log_verbosity >= SSH_LOG_FUNCTIONS){ \