diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2abaff802..9f098b301 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -780,7 +780,7 @@ find_feature(GSSAPI ${GSSAPI_FEATURE_TYPE} ${GSSAPI_FEATURE_PURPOSE} ${GSSAPI_FE
 
 if ( (WITH_GSSAPI) AND (NOT GSS_FOUND))
 	message(WARNING "-DWITH_GSSAPI=ON is set, but not GSSAPI implementation was found, disabling")
-else()
+elseif(WITH_GSSAPI)
 	if(GSS_FLAVOUR STREQUAL "MIT") 
 		message(STATUS "MIT Kerberos suppport")
 		add_definitions("-DWITH_GSSAPI -DWITH_GSSAPI_MIT")
diff --git a/winpr/libwinpr/sspi/sspi_gss.c b/winpr/libwinpr/sspi/sspi_gss.c
index 0b33462c5..b2060520b 100644
--- a/winpr/libwinpr/sspi/sspi_gss.c
+++ b/winpr/libwinpr/sspi/sspi_gss.c
@@ -19,13 +19,6 @@
  * limitations under the License.
  */
 
-#include <inttypes.h>
-#include <stddef.h>
-
-#include "../../include/winpr/synch.h"
-#include "../../include/winpr/wlog.h"
-#include "../../include/winpr/wtypes.h"
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif