diff --git a/winpr/include/winpr/wnd.h b/winpr/include/winpr/wnd.h
new file mode 100644
index 000000000..34fafffdf
--- /dev/null
+++ b/winpr/include/winpr/wnd.h
@@ -0,0 +1,42 @@
+/**
+ * WinPR: Windows Portable Runtime
+ * Window Notification System
+ *
+ * Copyright 2014 Marc-Andre Moreau <marcandre.moreau@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef WINPR_WND_H
+#define WINPR_WND_H
+
+#include <winpr/winpr.h>
+#include <winpr/wtypes.h>
+#include <winpr/windows.h>
+
+#ifndef _WIN32
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+#endif /* WINPR_WND_H */
+
diff --git a/winpr/libwinpr/wnd/CMakeLists.txt b/winpr/libwinpr/wnd/CMakeLists.txt
new file mode 100644
index 000000000..9c75538b1
--- /dev/null
+++ b/winpr/libwinpr/wnd/CMakeLists.txt
@@ -0,0 +1,50 @@
+# WinPR: Windows Portable Runtime
+# libwinpr-wnd cmake build script
+#
+# Copyright 2014 Marc-Andre Moreau <marcandre.moreau@gmail.com>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set(MODULE_NAME "winpr-wnd")
+set(MODULE_PREFIX "WINPR_WND")
+
+set(${MODULE_PREFIX}_SRCS
+	wnd.c)
+
+if(MSVC AND (NOT MONOLITHIC_BUILD))
+	set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} module.def)
+endif()
+
+add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
+	MONOLITHIC ${MONOLITHIC_BUILD}
+	SOURCES ${${MODULE_PREFIX}_SRCS})
+
+set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")
+
+set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
+	MONOLITHIC ${MONOLITHIC_BUILD} INTERNAL
+	MODULE winpr
+	MODULES winpr-crt)
+
+if(MONOLITHIC_BUILD)
+
+else()
+	target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
+	install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT WinPRTargets)
+endif()
+
+set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR")
+
+if(BUILD_TESTING)
+	add_subdirectory(test)
+endif()
diff --git a/winpr/libwinpr/wnd/ModuleOptions.cmake b/winpr/libwinpr/wnd/ModuleOptions.cmake
new file mode 100644
index 000000000..181cd057d
--- /dev/null
+++ b/winpr/libwinpr/wnd/ModuleOptions.cmake
@@ -0,0 +1,9 @@
+
+set(MINWIN_LAYER "0")
+set(MINWIN_GROUP "none")
+set(MINWIN_MAJOR_VERSION "0")
+set(MINWIN_MINOR_VERSION "0")
+set(MINWIN_SHORT_NAME "wnd")
+set(MINWIN_LONG_NAME "Window Notification")
+set(MODULE_LIBRARY_NAME "${MINWIN_SHORT_NAME}")
+
diff --git a/winpr/libwinpr/wnd/module.def b/winpr/libwinpr/wnd/module.def
new file mode 100644
index 000000000..de91bf1fa
--- /dev/null
+++ b/winpr/libwinpr/wnd/module.def
@@ -0,0 +1,3 @@
+LIBRARY		"libwinpr-wnd"
+EXPORTS
+
diff --git a/winpr/libwinpr/wnd/test/.gitignore b/winpr/libwinpr/wnd/test/.gitignore
new file mode 100644
index 000000000..8d12bf00e
--- /dev/null
+++ b/winpr/libwinpr/wnd/test/.gitignore
@@ -0,0 +1,3 @@
+TestWnd
+TestWnd.c
+
diff --git a/winpr/libwinpr/wnd/test/CMakeLists.txt b/winpr/libwinpr/wnd/test/CMakeLists.txt
new file mode 100644
index 000000000..9b09ce47d
--- /dev/null
+++ b/winpr/libwinpr/wnd/test/CMakeLists.txt
@@ -0,0 +1,31 @@
+
+set(MODULE_NAME "TestWnd")
+set(MODULE_PREFIX "TEST_WND")
+
+set(${MODULE_PREFIX}_DRIVER ${MODULE_NAME}.c)
+
+set(${MODULE_PREFIX}_TESTS
+	TestWndCreateWindowEx.c)
+
+create_test_sourcelist(${MODULE_PREFIX}_SRCS
+	${${MODULE_PREFIX}_DRIVER}
+	${${MODULE_PREFIX}_TESTS})
+
+add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
+
+set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
+	MONOLITHIC ${MONOLITHIC_BUILD}
+	MODULE winpr
+	MODULES winpr-crt winpr-wnd)
+
+target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
+
+set_target_properties(${MODULE_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${TESTING_OUTPUT_DIRECTORY}")
+
+foreach(test ${${MODULE_PREFIX}_TESTS})
+	get_filename_component(TestName ${test} NAME_WE)
+	add_test(${TestName} ${TESTING_OUTPUT_DIRECTORY}/${MODULE_NAME} ${TestName})
+endforeach()
+
+set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/Test")
+
diff --git a/winpr/libwinpr/wnd/test/TestWndCreateWindowEx.c b/winpr/libwinpr/wnd/test/TestWndCreateWindowEx.c
new file mode 100644
index 000000000..111146cd3
--- /dev/null
+++ b/winpr/libwinpr/wnd/test/TestWndCreateWindowEx.c
@@ -0,0 +1,9 @@
+
+#include <winpr/crt.h>
+#include <winpr/wnd.h>
+
+int TestWndCreateWindowEx(int argc, char* argv[])
+{
+	return 0;
+}
+
diff --git a/winpr/libwinpr/wnd/wnd.c b/winpr/libwinpr/wnd/wnd.c
new file mode 100644
index 000000000..cedda9dad
--- /dev/null
+++ b/winpr/libwinpr/wnd/wnd.c
@@ -0,0 +1,30 @@
+/**
+ * WinPR: Windows Portable Runtime
+ * Window Notification System
+ *
+ * Copyright 2014 Marc-Andre Moreau <marcandre.moreau@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <winpr/wnd.h>
+
+#ifndef _WIN32
+
+
+
+#endif