diff --git a/modules/client/client.lua b/modules/client/client.lua
index 64e84946..6a9ff85b 100644
--- a/modules/client/client.lua
+++ b/modules/client/client.lua
@@ -34,7 +34,6 @@ function Client.init()
   g_window.setTitle('OTClient')
   g_window.setIcon(resolvepath('clienticon.png'))
 
-
   -- show the only window after the first frame is rendered
   scheduleEvent(function()
     scheduleEvent(function()
diff --git a/src/framework/CMakeLists.txt b/src/framework/CMakeLists.txt
index 738d2fd5..4998cf8b 100644
--- a/src/framework/CMakeLists.txt
+++ b/src/framework/CMakeLists.txt
@@ -60,10 +60,10 @@ SET(CMAKE_C_FLAGS_RELFORPERFORMANCE   "-Ofast -mmmx -msse -msse2")
 SET(CMAKE_CXX_LINK_FLAGS              "${CMAKE_CXX_LINK_FLAGS} -static-libgcc -static-libstdc++ -Wl,--as-needed")
 
 MESSAGE(STATUS "Build type: " ${CMAKE_BUILD_TYPE})
-ADD_DEFINITIONS(-DBUILD_TYPE="${CMAKE_BUILD_TYPE}")
+ADD_DEFINITIONS(-D"BUILD_TYPE=\\\"${CMAKE_BUILD_TYPE}\\\"")
 
-ADD_DEFINITIONS(-DBUILD_REVISION="${BUILD_REVISION}")
 MESSAGE(STATUS "Build revision: ${BUILD_REVISION}")
+ADD_DEFINITIONS(-D"BUILD_REVISION=\\\"${BUILD_REVISION}\\\"")
 
 IF(USE_OPENGL_ES2)
     MESSAGE(STATUS "Renderer: OpenGL ES 2.0")
@@ -236,5 +236,5 @@ SET(framework_SOURCES ${framework_SOURCES}
 
     # framework third party
     ${CMAKE_CURRENT_LIST_DIR}/thirdparty/apngloader.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/thirdparty/lbitlib-5.2.0-backport4.c
+    ${CMAKE_CURRENT_LIST_DIR}/thirdparty/lbitlib-5.2.0-backport4.cpp
 )
diff --git a/src/framework/platform/unixcrashhandler.cpp b/src/framework/platform/unixcrashhandler.cpp
index 112f2d22..756a6955 100644
--- a/src/framework/platform/unixcrashhandler.cpp
+++ b/src/framework/platform/unixcrashhandler.cpp
@@ -20,12 +20,14 @@
  * THE SOFTWARE.
  */
 
-#define __USE_GNU
-
 #include "crashhandler.h"
 #include <framework/global.h>
 #include <framework/application.h>
 
+#ifndef __USE_GNU
+#define __USE_GNU
+#endif
+
 #include <execinfo.h>
 #include <ucontext.h>
 
diff --git a/src/framework/thirdparty/lbitlib-5.2.0-backport4.c b/src/framework/thirdparty/lbitlib-5.2.0-backport4.cpp
similarity index 99%
rename from src/framework/thirdparty/lbitlib-5.2.0-backport4.c
rename to src/framework/thirdparty/lbitlib-5.2.0-backport4.cpp
index 1cd3dc6e..6ad823cf 100644
--- a/src/framework/thirdparty/lbitlib-5.2.0-backport4.c
+++ b/src/framework/thirdparty/lbitlib-5.2.0-backport4.cpp
@@ -32,8 +32,10 @@
 
 #define LUA_LIB
 
+extern "C" {
 #include <lua.h>
 #include <lauxlib.h>
+}
 
 /* ----- adapted from lua-5.2.0 luaconf.h: ----- */
 
diff --git a/src/framework/thirdparty/lbitlib-5.2.0-backport4.h b/src/framework/thirdparty/lbitlib-5.2.0-backport4.h
index 078124bd..afbc7e99 100644
--- a/src/framework/thirdparty/lbitlib-5.2.0-backport4.h
+++ b/src/framework/thirdparty/lbitlib-5.2.0-backport4.h
@@ -25,8 +25,6 @@
 
 struct lua_State;
 
-extern "C" {
 int luaopen_bit32 (lua_State *L);
-};
 
 #endif