diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9593f38..fdc826b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,6 +22,8 @@ MACRO(SOURCE_GROUP_BY_DIR SOURCE_FILES)
     ENDIF(MSVC)
 ENDMACRO(SOURCE_GROUP_BY_DIR)
 
+add_definitions(-DUNICODE -D_UNICODE)
+
 SET(Thirdparty ${CMAKE_CURRENT_SOURCE_DIR}/Thirdparty)
 SET(ProjectDIR ${CMAKE_CURRENT_SOURCE_DIR})
 
diff --git a/Thirdparty/libcef/libcef_dll_wrapper/libcef_dll_wrapper.lib b/Thirdparty/libcef/libcef_dll_wrapper/libcef_dll_wrapper.lib
new file mode 100644
index 0000000..ed1f882
Binary files /dev/null and b/Thirdparty/libcef/libcef_dll_wrapper/libcef_dll_wrapper.lib differ
diff --git a/src/CEF/CefApp.cpp b/src/CEF/CefApp.cpp
index 8562faf..2af4535 100644
--- a/src/CEF/CefApp.cpp
+++ b/src/CEF/CefApp.cpp
@@ -2,7 +2,7 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-#include "tests/cefsimple/simple_app.h"
+#include "CEF/CefApp.h"
 
 #include <string>
 
@@ -11,7 +11,7 @@
 #include "include/views/cef_browser_view.h"
 #include "include/views/cef_window.h"
 #include "include/wrapper/cef_helpers.h"
-#include "tests/cefsimple/simple_handler.h"
+#include "CEF/simple_handler.h"
 
 namespace {
 
diff --git a/src/CEF/CefApp.h b/src/CEF/CefApp.h
index ab12edd..81afd54 100644
--- a/src/CEF/CefApp.h
+++ b/src/CEF/CefApp.h
@@ -5,7 +5,7 @@
 #ifndef CEF_TESTS_CEFSIMPLE_SIMPLE_APP_H_
 #define CEF_TESTS_CEFSIMPLE_SIMPLE_APP_H_
 
-#include "cef_app.h"
+#include "include/cef_app.h"
 
 // Implement application-level callbacks for the browser process.
 class SimpleApp : public CefApp, public CefBrowserProcessHandler {
diff --git a/src/CEF/simple_handler.cc b/src/CEF/simple_handler.cpp
similarity index 99%
rename from src/CEF/simple_handler.cc
rename to src/CEF/simple_handler.cpp
index fd18648..9ed699a 100644
--- a/src/CEF/simple_handler.cc
+++ b/src/CEF/simple_handler.cpp
@@ -2,7 +2,7 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-#include "tests/cefsimple/simple_handler.h"
+#include "CEF/simple_handler.h"
 
 #include <sstream>
 #include <string>
diff --git a/src/CEF/simple_handler_win.cc b/src/CEF/simple_handler_win.cpp
similarity index 92%
rename from src/CEF/simple_handler_win.cc
rename to src/CEF/simple_handler_win.cpp
index 1bc4de4..c0ad030 100644
--- a/src/CEF/simple_handler_win.cc
+++ b/src/CEF/simple_handler_win.cpp
@@ -2,7 +2,7 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-#include "tests/cefsimple/simple_handler.h"
+#include "CEF/simple_handler.h"
 
 #include <windows.h>
 #include <string>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 66d3594..3824fa3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -26,7 +26,7 @@ INCLUDE_DIRECTORIES(
     ${Thirdparty}/spdlog/include
     ${Thirdparty}/libipc/include
     ${Thirdparty}/zeromq/include
-    ${Thirdparty}/libcef/include
+    ${Thirdparty}/libcef
 )
 
 link_directories(
@@ -36,6 +36,7 @@ link_directories(
     ${Thirdparty}/libipc/lib
     ${Thirdparty}/zeromq/debug/lib
     ${Thirdparty}/libcef/lib
+    ${Thirdparty}/libcef/libcef_dll_wrapper
 )
 
 # IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
@@ -77,6 +78,7 @@ target_link_libraries(
     debug Debug/libcef
     optimized libcef
     libzmq-mt-gd-4_3_5
+    libcef_dll_wrapper
 )