4 files changed, 17 insertions, 11 deletions
diff --git a/src/server/gdb_server.h b/src/server/gdb_server.h
index ea981f31..4e334bc0 100644
--- a/src/server/gdb_server.h
+++ b/src/server/gdb_server.h
@@ -54,8 +54,8 @@ typedef struct gdb_service_s
 	struct target_s *target;
 } gdb_service_t;
 
-extern int gdb_init(void);
-extern int gdb_register_commands(command_context_t *command_context);
+int gdb_init(void);
+int gdb_register_commands(command_context_t *command_context);
 
 #define ERROR_GDB_BUFFER_TOO_SMALL (-800)
 #define ERROR_GDB_TIMEOUT (-801)
diff --git a/src/server/server.h b/src/server/server.h
index dab28eca..d4f1b6b5 100644
--- a/src/server/server.h
+++ b/src/server/server.h
@@ -69,11 +69,17 @@ typedef struct service_s
 	struct service_s *next;
 } service_t;
 
-extern int add_service(char *name, enum connection_type type, unsigned short port, int max_connections, new_connection_handler_t new_connection_handler, input_handler_t input_handler, connection_closed_handler_t connection_closed_handler, void *priv);
-extern int server_init(void);
-extern int server_quit(void);
-extern int server_loop(command_context_t *command_context);
-extern int server_register_commands(command_context_t *context);
+int add_service(char *name, enum connection_type type, unsigned short port,
+		int max_connections, new_connection_handler_t new_connection_handler,
+		input_handler_t in_handler, connection_closed_handler_t close_handler,
+		void *priv);
+
+int server_init(void);
+int server_quit(void);
+
+int server_loop(command_context_t *command_context);
+
+int server_register_commands(command_context_t *context);
 
 int server_port_command(struct command_context_s *cmd_ctx,
 		char *cmd, char **args, int argc, unsigned short *port);
diff --git a/src/server/tcl_server.h b/src/server/tcl_server.h
index c90dc8e9..d6c9e10b 100644
--- a/src/server/tcl_server.h
+++ b/src/server/tcl_server.h
@@ -22,7 +22,7 @@
 
 #include "server.h"
 
-extern int tcl_init(void);
-extern int tcl_register_commands(command_context_t *cmd_ctx);
+int tcl_init(void);
+int tcl_register_commands(command_context_t *cmd_ctx);
 
 #endif /* _TCL_SERVER_H_ */
diff --git a/src/server/telnet_server.h b/src/server/telnet_server.h
index 541d720d..8f0d24ab 100644
--- a/src/server/telnet_server.h
+++ b/src/server/telnet_server.h
@@ -68,7 +68,7 @@ typedef struct telnet_service_s
 	char *banner;
 } telnet_service_t;
 
-extern int telnet_init(char *banner);
-extern int telnet_register_commands(command_context_t *command_context);
+int telnet_init(char *banner);
+int telnet_register_commands(command_context_t *command_context);
 
 #endif /* TELNET_SERVER_H */