diff --git a/src/lib/elementary/elm_code_parse.c b/src/lib/elementary/elm_code_parse.c
index 5869f8cf33..d7b85b6fce 100644
--- a/src/lib/elementary/elm_code_parse.c
+++ b/src/lib/elementary/elm_code_parse.c
@@ -6,6 +6,9 @@
 
 #include "elm_code_private.h"
 
+EAPI Elm_Code_Parser *ELM_CODE_PARSER_STANDARD_DIFF = NULL;
+EAPI Elm_Code_Parser *ELM_CODE_PARSER_STANDARD_TODO = NULL;
+
 struct _Elm_Code_Parser
 {
    void (*parse_line)(Elm_Code_Line *, void *);
diff --git a/src/lib/elementary/elm_code_parse.h b/src/lib/elementary/elm_code_parse.h
index bc674f8b41..d5a78cec83 100644
--- a/src/lib/elementary/elm_code_parse.h
+++ b/src/lib/elementary/elm_code_parse.h
@@ -12,8 +12,8 @@ extern "C" {
 
 typedef struct _Elm_Code_Parser Elm_Code_Parser;
 
-EAPI Elm_Code_Parser *ELM_CODE_PARSER_STANDARD_DIFF; /**< A provided parser that will mark up diff text */
-EAPI Elm_Code_Parser *ELM_CODE_PARSER_STANDARD_TODO; /**< A provided parser that will highlight TODO and FIXME lines */
+extern EAPI Elm_Code_Parser *ELM_CODE_PARSER_STANDARD_DIFF; /**< A provided parser that will mark up diff text */
+extern EAPI Elm_Code_Parser *ELM_CODE_PARSER_STANDARD_TODO; /**< A provided parser that will highlight TODO and FIXME lines */
 
 /**
  * @brief Parser helper functions.
diff --git a/src/lib/elementary/elm_code_private.h b/src/lib/elementary/elm_code_private.h
index 39f89bdd5e..ef08aabaf9 100644
--- a/src/lib/elementary/elm_code_private.h
+++ b/src/lib/elementary/elm_code_private.h
@@ -1,7 +1,7 @@
 #ifndef ELM_CODE_PRIVATE_H
 # define ELM_CODE_PRIVATE_H
 
-int _elm_code_lib_log_dom;
+extern int _elm_code_lib_log_dom;
 
 #ifdef ERR
 # undef ERR