diff --git a/CMakeLists.txt b/CMakeLists.txt
index b14572bc..a657a73f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -624,7 +624,7 @@ if (NOT CROSSTOOLS)
 		endif()
 		find_package(Lua QUIET)
 		if (LUA_FOUND)
-			message(STATUS "Building PIP with Lua support")
+			message(STATUS "Building PIP with Lua support: Lua ${LUA_VERSION_STRING}")
 			import_version(pip_lua pip)
 			set_deploy_property(pip_lua ${PIP_LIB_TYPE}
 				LABEL "PIP Lua support"
@@ -638,8 +638,10 @@ if (NOT CROSSTOOLS)
 			add_library(pip_lua ${PIP_LIB_TYPE} ${CPP_LIB_LUA} ${_RC})
 			target_link_libraries(pip_lua pip ${LUA_LIBRARIES})
 			list(APPEND PIP_LIBS_TARGETS pip_lua)
+		else()
+			message(STATUS "Building PIP without Lua support")
 		endif()
-
+		
 		# Test program
 		if(PIP_UTILS)
 			add_executable(pip_test "main.cpp")
diff --git a/lib/main/lua/pip_lua.h b/lib/main/lua/pip_lua.h
index 56a1a9a5..a9b94167 100644
--- a/lib/main/lua/pip_lua.h
+++ b/lib/main/lua/pip_lua.h
@@ -24,11 +24,7 @@
 #ifndef PIP_LUA_H
 #define PIP_LUA_H
 
-extern "C" {
-# include "lua.h"
-# include "lauxlib.h"
-# include "lualib.h"
-}
+#include "lua.hpp"
 #include <LuaBridge/LuaBridge.h>
 #include "pistring.h"