diff --git a/examples/rpl_udp/main.c b/examples/rpl_udp/main.c
index f5cbe0cecd14c05e6a6333ec8f6b11c591a920c9..4c88c9938bb899ddd61527bb131121d6f9b1f798 100644
--- a/examples/rpl_udp/main.c
+++ b/examples/rpl_udp/main.c
@@ -29,7 +29,7 @@
 
 #include "rpl_udp.h"
 
-const shell_command_t shell_commands[] = {
+static const shell_command_t shell_commands[] = {
     {"init", "Initialize network", rpl_udp_init},
     {"set", "Set ID", rpl_udp_set_id},
     {"dodag", "Shows the dodag", rpl_udp_dodag},
diff --git a/examples/rpl_udp/rpl.c b/examples/rpl_udp/rpl.c
index 0b1fe6b2f6f430624874813d5e846e9a0367ba43..3d4cad5dc3772bad1929b490b77b71a4b40f3f48 100644
--- a/examples/rpl_udp/rpl.c
+++ b/examples/rpl_udp/rpl.c
@@ -35,10 +35,10 @@
 
 #define TRANSCEIVER TRANSCEIVER_DEFAULT
 
-char monitor_stack_buffer[MONITOR_STACK_SIZE];
+static char monitor_stack_buffer[MONITOR_STACK_SIZE];
 radio_address_t id;
 
-uint8_t is_root = 0;
+static uint8_t is_root = 0;
 
 void rpl_udp_init(int argc, char **argv)
 {
diff --git a/examples/rpl_udp/udp.c b/examples/rpl_udp/udp.c
index a7671ab9e96aa67d6ec7dc50dffe2d6ecd7e9b4a..890a181d54b9625b6582792202957d57b39331fa 100644
--- a/examples/rpl_udp/udp.c
+++ b/examples/rpl_udp/udp.c
@@ -35,7 +35,7 @@
 #define UDP_BUFFER_SIZE     (128)
 #define SERVER_PORT     (0xFF01)
 
-char udp_server_stack_buffer[KERNEL_CONF_STACKSIZE_MAIN];
+static char udp_server_stack_buffer[KERNEL_CONF_STACKSIZE_MAIN];
 char addr_str[IPV6_MAX_ADDR_STR_LEN];
 
 static void *init_udp_server(void *);
diff --git a/sys/net/routing/rpl/of0.c b/sys/net/routing/rpl/of0.c
index 5c7c4797463d80dc5df938c8e4db4b4620ddccc7..913be73b87cb56ffc755f9f5b9403667c9c24122 100644
--- a/sys/net/routing/rpl/of0.c
+++ b/sys/net/routing/rpl/of0.c
@@ -27,7 +27,7 @@ static rpl_parent_t *which_parent(rpl_parent_t *, rpl_parent_t *);
 static rpl_dodag_t *which_dodag(rpl_dodag_t *, rpl_dodag_t *);
 static void reset(rpl_dodag_t *);
 
-rpl_of_t rpl_of0 = {
+static rpl_of_t rpl_of0 = {
     0x0,
     calc_rank,
     which_parent,
diff --git a/sys/net/routing/rpl/of_mrhof.c b/sys/net/routing/rpl/of_mrhof.c
index 367c0418585bc7df36ece9031d049d49c36d07e1..83eb3bb2850071daea2da2b1dff5bd2cbf3dd039 100644
--- a/sys/net/routing/rpl/of_mrhof.c
+++ b/sys/net/routing/rpl/of_mrhof.c
@@ -34,10 +34,10 @@ static rpl_dodag_t *which_dodag(rpl_dodag_t *, rpl_dodag_t *);
 static void reset(rpl_dodag_t *);
 static uint16_t calc_path_cost(rpl_parent_t *parent);
 
-uint16_t cur_min_path_cost = MAX_PATH_COST;
-rpl_parent_t *cur_preferred_parent = NULL;
+static uint16_t cur_min_path_cost = MAX_PATH_COST;
+static rpl_parent_t *cur_preferred_parent = NULL;
 
-rpl_of_t rpl_of_mrhof = {
+static rpl_of_t rpl_of_mrhof = {
     0x1,
     calc_rank,
     which_parent,
diff --git a/sys/net/routing/rpl/rpl.c b/sys/net/routing/rpl/rpl.c
index 0b24bb9dba70167bc1d2a19bb78dd480f66cc4c2..44d12d1e4a4981d00664fa43f18b3e337f530391 100644
--- a/sys/net/routing/rpl/rpl.c
+++ b/sys/net/routing/rpl/rpl.c
@@ -62,18 +62,20 @@ static void _dao_handle_send(rpl_dodag_t *dodag);
 static void _rpl_update_routing_table(void);
 
 #if RPL_DEFAULT_MOP == RPL_NON_STORING_MODE
-uint8_t srh_buffer[BUFFER_SIZE];
-uint8_t srh_send_buffer[BUFFER_SIZE];
-ipv6_addr_t *down_next_hop;
-ipv6_srh_t *srh_header;
-msg_t srh_m_send, srh_m_recv;
+#if RPL_MAX_ROUTING_ENTRIES != 0
+static uint8_t srh_buffer[BUFFER_SIZE];
+#endif
+static uint8_t srh_send_buffer[BUFFER_SIZE];
+static ipv6_addr_t *down_next_hop;
+static ipv6_srh_t *srh_header;
+static msg_t srh_m_send, srh_m_recv;
 #endif
 
 #if RPL_MAX_ROUTING_ENTRIES != 0
-rpl_routing_entry_t rpl_routing_table[RPL_MAX_ROUTING_ENTRIES];
+static rpl_routing_entry_t rpl_routing_table[RPL_MAX_ROUTING_ENTRIES];
 #endif
 uint8_t rpl_max_routing_entries;
-ipv6_addr_t my_address;
+static ipv6_addr_t my_address;
 
 /* IPv6 message buffer */
 static ipv6_hdr_t *ipv6_buf;
diff --git a/sys/net/routing/rpl/rpl_dodag.c b/sys/net/routing/rpl/rpl_dodag.c
index 630e2d97f61733d3fe578ed9704a2b29188faf52..3a6b8896eaecb8d7681692e3d7bb0f31b20e6757 100644
--- a/sys/net/routing/rpl/rpl_dodag.c
+++ b/sys/net/routing/rpl/rpl_dodag.c
@@ -31,9 +31,9 @@ char addr_str[IPV6_MAX_ADDR_STR_LEN];
 #endif
 #include "debug.h"
 
-rpl_instance_t instances[RPL_MAX_INSTANCES];
-rpl_dodag_t dodags[RPL_MAX_DODAGS];
-rpl_parent_t parents[RPL_MAX_PARENTS];
+static rpl_instance_t instances[RPL_MAX_INSTANCES];
+static rpl_dodag_t dodags[RPL_MAX_DODAGS];
+static rpl_parent_t parents[RPL_MAX_PARENTS];
 
 void rpl_trickle_send_dio(void *args) {
     (void) args;
diff --git a/sys/net/routing/rpl/rpl_nonstoring/rpl_nonstoring.c b/sys/net/routing/rpl/rpl_nonstoring/rpl_nonstoring.c
index d7a4884437cb0102011a667beb2d6e0acd0c25f3..503334de7287bc88901e251251f24c4c8ca57487 100644
--- a/sys/net/routing/rpl/rpl_nonstoring/rpl_nonstoring.c
+++ b/sys/net/routing/rpl/rpl_nonstoring/rpl_nonstoring.c
@@ -27,7 +27,7 @@
 
 #define ENABLE_DEBUG    (0)
 #if ENABLE_DEBUG
-char addr_str_mode[IPV6_MAX_ADDR_STR_LEN];
+static char addr_str_mode[IPV6_MAX_ADDR_STR_LEN];
 #endif
 #include "debug.h"
 
diff --git a/sys/net/routing/rpl/rpl_of_manager.c b/sys/net/routing/rpl/rpl_of_manager.c
index a45a026d2f8e9163b445bae61355005b9e7e249c..d60944d5d8e09be9c5f91dfbcfb20b623160e302 100644
--- a/sys/net/routing/rpl/rpl_of_manager.c
+++ b/sys/net/routing/rpl/rpl_of_manager.c
@@ -29,7 +29,7 @@
 #define ENABLE_DEBUG (0)
 #include "debug.h"
 
-rpl_of_t *objective_functions[NUMBER_IMPLEMENTED_OFS];
+static rpl_of_t *objective_functions[NUMBER_IMPLEMENTED_OFS];
 
 void rpl_of_manager_init(ipv6_addr_t *my_address)
 {
diff --git a/sys/net/routing/rpl/rpl_storing/rpl_storing.c b/sys/net/routing/rpl/rpl_storing/rpl_storing.c
index 4d09e8433fdf274f93f776dd4b6eb80be5fd9f0f..2afc8f5f1cdf201d2f312d3f9d7f28bf7840d489 100644
--- a/sys/net/routing/rpl/rpl_storing/rpl_storing.c
+++ b/sys/net/routing/rpl/rpl_storing/rpl_storing.c
@@ -28,7 +28,7 @@
 
 #define ENABLE_DEBUG    (0)
 #if ENABLE_DEBUG
-char addr_str_mode[IPV6_MAX_ADDR_STR_LEN];
+static char addr_str_mode[IPV6_MAX_ADDR_STR_LEN];
 #endif
 #include "debug.h"