diff --git a/rdtk/include/rdtk/rdtk.h b/rdtk/include/rdtk/rdtk.h
index c26cb0c79..dff5139f8 100644
--- a/rdtk/include/rdtk/rdtk.h
+++ b/rdtk/include/rdtk/rdtk.h
@@ -42,8 +42,8 @@ extern "C" {
 
 /* Engine */
 
-rdtkEngine* rdtk_engine_new();
-void rdtk_engine_free(rdtkEngine* engine);
+RDTK_EXPORT rdtkEngine* rdtk_engine_new();
+RDTK_EXPORT void rdtk_engine_free(rdtkEngine* engine);
 
 /* Surface */
 
diff --git a/winpr/include/winpr/environment.h b/winpr/include/winpr/environment.h
index 15ac44e3b..96f6b4964 100644
--- a/winpr/include/winpr/environment.h
+++ b/winpr/include/winpr/environment.h
@@ -82,7 +82,6 @@ WINPR_API BOOL SetEnvironmentVariableEBA(LPSTR * envBlock,LPCSTR lpName, LPCSTR
 }
 #endif
 
-
 #ifdef UNICODE
 #define GetCurrentDirectory		GetCurrentDirectoryW
 #define SetCurrentDirectory		SetCurrentDirectoryW
diff --git a/winpr/include/winpr/wnd.h b/winpr/include/winpr/wnd.h
index 21e8e8fa6..f09995913 100644
--- a/winpr/include/winpr/wnd.h
+++ b/winpr/include/winpr/wnd.h
@@ -410,8 +410,6 @@ typedef struct tagWTSSESSION_NOTIFICATION
 #define WTS_SESSION_LOCK			0x7
 #define WTS_SESSION_UNLOCK			0x8
 #define WTS_SESSION_REMOTE_CONTROL		0x9
-#define WTS_SESSION_CREATE			0xA
-#define WTS_SESSION_TERMINATE			0xB
 
 #ifdef __cplusplus
 extern "C" {
@@ -567,5 +565,13 @@ WINPR_API LRESULT WINAPI DefWindowProcW(HWND hWnd, UINT Msg, WPARAM wParam, LPAR
 
 #endif
 
+#ifndef WTS_SESSION_CREATE
+#define WTS_SESSION_CREATE			0xA
+#endif
+
+#ifndef WTS_SESSION_TERMINATE
+#define WTS_SESSION_TERMINATE			0xB
+#endif
+
 #endif /* WINPR_WND_H */