diff --git a/src/lib/evas/Evas.hh b/src/lib/evas/Evas.hh
index 893f895ca9..064d8c184e 100644
--- a/src/lib/evas/Evas.hh
+++ b/src/lib/evas/Evas.hh
@@ -1,7 +1,7 @@
 #ifndef EVAS_HH
 #define EVAS_HH
 
-#if defined(EVAS_H)
+#if defined(_EVAS_H)
 #error "Do not include Evas C API headers before including Evas.hh"
 #endif
 
diff --git a/src/tests/evas_cxx/cxx_compile_test.cc b/src/tests/evas_cxx/cxx_compile_test.cc
index ba354deb78..90527adf25 100644
--- a/src/tests/evas_cxx/cxx_compile_test.cc
+++ b/src/tests/evas_cxx/cxx_compile_test.cc
@@ -1,13 +1,5 @@
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <Evas.h>
 #include <Evas.hh>
 
-#include <iostream>
-
 int main()
 {
    return 0;