diff --git a/configure.bat b/configure.bat
index 145d88825b..d318a4b75f 100644
--- a/configure.bat
+++ b/configure.bat
@@ -82,7 +82,7 @@ exit /B 0
         set CFLAGS=-Wno-nonportable-system-include-path %CFLAGS%
         set CFLAGS=-Wno-microsoft-enum-forward-reference %CFLAGS%
     :: Syntax/Parsing
-        :: set CFLAGS=-Wno-implicit-function-declaration %CFLAGS%
+        set CFLAGS=-Wno-implicit-function-declaration %CFLAGS%
         set CFLAGS=-Wno-missing-prototypes %CFLAGS%
         set CFLAGS=-Wno-unreachable-code %CFLAGS%
         set CFLAGS=-Wno-unreachable-code-return %CFLAGS%
diff --git a/src/lib/eina/eina_xattr.h b/src/lib/eina/eina_xattr.h
index 16d9c55078..f129a141f4 100644
--- a/src/lib/eina/eina_xattr.h
+++ b/src/lib/eina/eina_xattr.h
@@ -21,7 +21,6 @@
 
 #include "eina_types.h"
 #include <sys/types.h>
-//#endif
 
 /**
  * @addtogroup Eina_Tools_Group Tools
diff --git a/src/lib/evil/evil_macro_wrapper.h b/src/lib/evil/evil_macro_wrapper.h
index f7b6242e3f..b4bf15a403 100644
--- a/src/lib/evil/evil_macro_wrapper.h
+++ b/src/lib/evil/evil_macro_wrapper.h
@@ -33,6 +33,18 @@
 #endif
 #define rename(src, dst) evil_rename(src, dst)
 
+/**
+ * @def mkdir(dirname, mode)
+ *
+ * Wrapper around evil_mkdir().
+ *
+ * @since 1.15
+ */
+#ifdef mkdir
+# undef mkdir
+#endif
+#define mkdir(dirname, ...) _mkdir(dirname)
+
 /*
  * evil_unistd.h
  */
diff --git a/src/lib/evil/evil_string.h b/src/lib/evil/evil_string.h
index fd55da1d53..872834f238 100644
--- a/src/lib/evil/evil_string.h
+++ b/src/lib/evil/evil_string.h
@@ -35,7 +35,7 @@
  *
  * Supported OS: Windows XP.
  */
-//EAPI char *strcasestr(const char *haystack, const char *needle);
+EAPI char *strcasestr(const char *haystack, const char *needle);
 
 /**
  * @brief Implements the strsep function which is used to separate strings.