diff --git a/libfreerdp/core/CMakeLists.txt b/libfreerdp/core/CMakeLists.txt
index 274ef15c1..274396ff3 100644
--- a/libfreerdp/core/CMakeLists.txt
+++ b/libfreerdp/core/CMakeLists.txt
@@ -25,9 +25,6 @@ include_directories(${ZLIB_INCLUDE_DIRS})
 
 set(${MODULE_PREFIX}_GATEWAY_DIR "gateway")
 
-include_directories(".")
-include_directories(${${MODULE_PREFIX}_GATEWAY_DIR})
-
 set(${MODULE_PREFIX}_GATEWAY_SRCS
 	${${MODULE_PREFIX}_GATEWAY_DIR}/tsg.c
 	${${MODULE_PREFIX}_GATEWAY_DIR}/tsg.h
diff --git a/libfreerdp/core/gateway/ntlm.h b/libfreerdp/core/gateway/ntlm.h
index b5385f617..554d19508 100644
--- a/libfreerdp/core/gateway/ntlm.h
+++ b/libfreerdp/core/gateway/ntlm.h
@@ -25,10 +25,11 @@
 typedef struct rdp_ntlm rdpNtlm;
 typedef struct rdp_ntlm_http rdpNtlmHttp;
 
-#include "tcp.h"
+#include "../tcp.h"
+#include "../transport.h"
+
 #include "rts.h"
 #include "http.h"
-#include "transport.h"
 
 #include <time.h>
 #include <winpr/sspi.h>
diff --git a/libfreerdp/core/gateway/rpc.h b/libfreerdp/core/gateway/rpc.h
index 4607d4a74..daf927f29 100644
--- a/libfreerdp/core/gateway/rpc.h
+++ b/libfreerdp/core/gateway/rpc.h
@@ -60,11 +60,12 @@ typedef struct _RPC_PDU
 	DWORD CallId;
 } RPC_PDU, *PRPC_PDU;
 
-#include "tcp.h"
+#include "../tcp.h"
+#include "../transport.h"
+
 #include "rts.h"
 #include "http.h"
 #include "ntlm.h"
-#include "transport.h"
 
 #include <time.h>
 
diff --git a/libfreerdp/core/gateway/tsg.h b/libfreerdp/core/gateway/tsg.h
index eee223d47..b10d2b1d0 100644
--- a/libfreerdp/core/gateway/tsg.h
+++ b/libfreerdp/core/gateway/tsg.h
@@ -35,6 +35,7 @@ typedef struct rdp_tsg rdpTsg;
 #include <time.h>
 #include <freerdp/types.h>
 #include <freerdp/settings.h>
+
 #include <freerdp/utils/stream.h>
 #include <freerdp/utils/debug.h>
 
diff --git a/libfreerdp/core/nla.c b/libfreerdp/core/nla.c
index d94409bd1..1943a9392 100644
--- a/libfreerdp/core/nla.c
+++ b/libfreerdp/core/nla.c
@@ -85,7 +85,7 @@
 #endif
 
 #ifdef WITH_NATIVE_SSPI
-#define NLA_PKG_NAME	NEGOSSP_NAME
+#define NLA_PKG_NAME	NTLMSP_NAME
 #else
 #define NLA_PKG_NAME	NTLMSP_NAME
 #endif
diff --git a/libfreerdp/core/transport.h b/libfreerdp/core/transport.h
index 8c8a76606..aeca58307 100644
--- a/libfreerdp/core/transport.h
+++ b/libfreerdp/core/transport.h
@@ -31,9 +31,10 @@ typedef enum
 typedef struct rdp_transport rdpTransport;
 
 #include "tcp.h"
-#include "tsg.h"
 #include "nla.h"
 
+#include "gateway/tsg.h"
+
 #include <winpr/sspi.h>
 #include <freerdp/crypto/tls.h>
 
diff --git a/winpr/include/winpr/dsparse.h b/winpr/include/winpr/dsparse.h
index ad4fbe5f6..013aadb2d 100644
--- a/winpr/include/winpr/dsparse.h
+++ b/winpr/include/winpr/dsparse.h
@@ -22,8 +22,8 @@
 
 #ifdef _WIN32
 
-#include <winpr/rpc.h>
 #include <winpr/windows.h>
+#include <winpr/rpc.h>
 
 #include <ntdsapi.h>