diff --git a/libs/indiclient/baseclient.cpp b/libs/indiclient/baseclient.cpp
index 3b0bafba8a..8f058dee93 100644
--- a/libs/indiclient/baseclient.cpp
+++ b/libs/indiclient/baseclient.cpp
@@ -317,7 +317,7 @@ bool BaseClient::connectServer()
 
     IDLog("INDI::BaseClient::connectServer: creating new connection...\n");
 
-#ifndef _WIN32
+#if !defined (_WIN32) && !defined (_WINDOWS)
     // System with unix support automatically connect over unix domain
     if (d->cServer != "localhost" || d->cServer != "127.0.0.1" || d->connectToHostAndWait("localhost:", d->cPort) == false)
 #endif
diff --git a/libs/indicore/indiutility.h b/libs/indicore/indiutility.h
index cc34272d81..c07e192b9c 100644
--- a/libs/indicore/indiutility.h
+++ b/libs/indicore/indiutility.h
@@ -64,7 +64,7 @@ inline static size_t indi_strlcpy(char * dst, const char * src, size_t maxlen)
 // C++
 #ifdef __cplusplus
 
-#ifdef _WIN32
+#if defined (_WIN32) || defined (_WINDOWS)
 typedef int mode_t;
 #endif