diff --git a/legacy/edje/src/bin/epp/cpplib.c b/legacy/edje/src/bin/epp/cpplib.c
index 0e5b47aa24..2b5bc63a15 100644
--- a/legacy/edje/src/bin/epp/cpplib.c
+++ b/legacy/edje/src/bin/epp/cpplib.c
@@ -4537,7 +4537,7 @@ cpp_get_token(cpp_reader * pfile)
 {
    int                 c, c2, c3;
    long                old_written = 0;
-   long                start_line, start_column;
+   long                start_line = 0, start_column = 0;
    enum cpp_token      token;
    struct cpp_options *opts = CPP_OPTIONS(pfile);
 
diff --git a/legacy/edje/src/bin/epp/cppmain.c b/legacy/edje/src/bin/epp/cppmain.c
index fdcc00c752..574d61e56d 100644
--- a/legacy/edje/src/bin/epp/cppmain.c
+++ b/legacy/edje/src/bin/epp/cppmain.c
@@ -123,15 +123,17 @@ main(int argc, char **argv)
 #endif
 	if (!opts->no_output)
 	  {
-	     size_t              n;
+	     size_t n;
 
 	     n = CPP_WRITTEN(&parse_in);
 	     if (fwrite(parse_in.token_buffer, 1, n, stdout) != n)
 		exit(FATAL_EXIT_CODE);
 	  }
+        /*
       next:
 	parse_in.limit = parse_in.token_buffer;
 	got_text = 0;
+         */
      }
 
  done: