diff --git a/source/inc/ze_util.h b/source/inc/ze_util.h
index c2733ebf..e616dc0b 100644
--- a/source/inc/ze_util.h
+++ b/source/inc/ze_util.h
@@ -44,8 +44,6 @@ inline void getLastErrorString(std::string &errorValue) {
 #  include <link.h>
 #  include <dlfcn.h>
 #  define HMODULE void*
-#  define MAKE_LIBRARY_NAME(NAME, VERSION)    "lib" NAME ".so." VERSION
-#  define MAKE_LAYER_NAME(NAME)    "lib" NAME ".so." L0_VALIDATION_LAYER_SUPPORTED_VERSION
 #  define LOAD_DRIVER_LIBRARY(NAME) dlopen(NAME, RTLD_LAZY|RTLD_LOCAL)
 #  define GET_LIBRARY_ERROR(ERROR_STRING) ERROR_STRING.assign(dlerror())
 #  define FREE_DRIVER_LIBRARY(LIB)  dlclose(LIB)
@@ -56,6 +54,14 @@ inline void getLastErrorString(std::string &errorValue) {
 #  define strdup_safe strdup
 #endif
 
+#if defined(ANDROID)
+#  define MAKE_LIBRARY_NAME(NAME, VERSION)    "lib" NAME ".so"
+#  define MAKE_LAYER_NAME(NAME)    "lib" NAME ".so"
+#elif !defined(WIN32)
+#  define MAKE_LIBRARY_NAME(NAME, VERSION)    "lib" NAME ".so." VERSION
+#  define MAKE_LAYER_NAME(NAME)    "lib" NAME ".so." L0_VALIDATION_LAYER_SUPPORTED_VERSION
+#endif
+
 inline std::string create_library_path(const char *name, const char *path){
     std::string library_path;
     if (path && (strcmp("", path) != 0)) {