diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
index 8235ff8..38a10e3 100644
--- a/layers/CMakeLists.txt
+++ b/layers/CMakeLists.txt
@@ -39,7 +39,6 @@
 )
 
 if (WIN32)
-    set (CMAKE_CXX_FLAGS "-std=c++11")
     set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DXGL_PROTOTYPES -D_CRT_SECURE_NO_WARNINGS")
     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DXGL_PROTOTYPES -D_CRT_SECURE_NO_WARNINGS")
 endif()
diff --git a/layers/basic.cpp b/layers/basic.cpp
index ac8cf80..41abf20 100644
--- a/layers/basic.cpp
+++ b/layers/basic.cpp
@@ -33,7 +33,6 @@
 
 static XGL_LAYER_DISPATCH_TABLE * initLayerTable(const XGL_BASE_LAYER_OBJECT *gpuw)
 {
-    xglGetProcAddrType fpGPA;
     XGL_LAYER_DISPATCH_TABLE *pTable;
 
     assert(gpuw);
diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
index 46fe814..2d2febf 100644
--- a/loader/CMakeLists.txt
+++ b/loader/CMakeLists.txt
@@ -16,12 +16,13 @@
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DXGL_PROTOTYPES -D_CRT_SECURE_NO_WARNINGS")
 
     add_library(XGL SHARED loader.c dirent_on_windows.c dispatch.c table_ops.h)
+    set_target_properties(XGL PROPERTIES SOVERSION 0)
+    target_link_libraries(XGL)
 endif()
 if (NOT WIN32)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DXGL_PROTOTYPES")
 
     add_library(XGL SHARED loader.c dispatch.c table_ops.h)
+    set_target_properties(XGL PROPERTIES SOVERSION 0)
+    target_link_libraries(XGL -ldl -lpthread)
 endif()
-
-set_target_properties(XGL PROPERTIES SOVERSION 0)
-target_link_libraries(XGL -ldl -lpthread)
diff --git a/xgl-win-def-file-generate.py b/xgl-win-def-file-generate.py
index 56016ee..9d66cae 100755
--- a/xgl-win-def-file-generate.py
+++ b/xgl-win-def-file-generate.py
@@ -94,7 +94,7 @@
         pass
 
     def generate_body(self):
-        return "LIBRARY " + sys.argv[1]
+        return "LIBRARY XGLLayer" + sys.argv[1]
 
     def generate_footer(self):
         return "EXPORTS\n   xglGetProcAddr\n   xglEnumerateLayers"