diff --git a/projectfiles/CodeBlocks/liblua.cbp b/projectfiles/CodeBlocks/liblua.cbp
index ca8f4fd4080..8e790615b3c 100644
--- a/projectfiles/CodeBlocks/liblua.cbp
+++ b/projectfiles/CodeBlocks/liblua.cbp
@@ -36,64 +36,64 @@
 			<Add option="-include ../../src/wesnoth_lua_config.h" />
 			<Add directory="../../src" />
 		</Compiler>
-		<Unit filename="../../src/lua/lapi.cpp" />
-		<Unit filename="../../src/lua/lapi.h" />
-		<Unit filename="../../src/lua/lauxlib.cpp" />
-		<Unit filename="../../src/lua/lauxlib.h" />
-		<Unit filename="../../src/lua/lbaselib.cpp" />
-		<Unit filename="../../src/lua/lcode.cpp" />
-		<Unit filename="../../src/lua/lcode.h" />
-		<Unit filename="../../src/lua/lcorolib.cpp" />
-		<Unit filename="../../src/lua/lctype.cpp" />
-		<Unit filename="../../src/lua/lctype.h" />
-		<Unit filename="../../src/lua/ldblib.cpp" />
-		<Unit filename="../../src/lua/ldebug.cpp" />
-		<Unit filename="../../src/lua/ldebug.h" />
-		<Unit filename="../../src/lua/ldo.cpp" />
-		<Unit filename="../../src/lua/ldo.h" />
-		<Unit filename="../../src/lua/ldump.cpp" />
-		<Unit filename="../../src/lua/lfunc.cpp" />
-		<Unit filename="../../src/lua/lfunc.h" />
-		<Unit filename="../../src/lua/lgc.cpp" />
-		<Unit filename="../../src/lua/lgc.h" />
-		<Unit filename="../../src/lua/ljumptab.h" />
-		<Unit filename="../../src/lua/liolib.cpp" />
-		<Unit filename="../../src/lua/llex.cpp" />
-		<Unit filename="../../src/lua/llex.h" />
-		<Unit filename="../../src/lua/llimits.h" />
-		<Unit filename="../../src/lua/lmathlib.cpp" />
-		<Unit filename="../../src/lua/lmem.cpp" />
-		<Unit filename="../../src/lua/lmem.h" />
-		<Unit filename="../../src/lua/loadlib.cpp" />
-		<Unit filename="../../src/lua/lobject.cpp" />
-		<Unit filename="../../src/lua/lobject.h" />
-		<Unit filename="../../src/lua/lopcodes.cpp" />
-		<Unit filename="../../src/lua/lopcodes.h" />
-		<Unit filename="../../src/lua/lopnames.h" />
-		<Unit filename="../../src/lua/loslib.cpp" />
-		<Unit filename="../../src/lua/lparser.cpp" />
-		<Unit filename="../../src/lua/lparser.h" />
-		<Unit filename="../../src/lua/lprefix.h" />
-		<Unit filename="../../src/lua/lstate.cpp" />
-		<Unit filename="../../src/lua/lstate.h" />
-		<Unit filename="../../src/lua/lstring.cpp" />
-		<Unit filename="../../src/lua/lstring.h" />
-		<Unit filename="../../src/lua/lstrlib.cpp" />
-		<Unit filename="../../src/lua/ltable.cpp" />
-		<Unit filename="../../src/lua/ltable.h" />
-		<Unit filename="../../src/lua/ltablib.cpp" />
-		<Unit filename="../../src/lua/ltm.cpp" />
-		<Unit filename="../../src/lua/ltm.h" />
-		<Unit filename="../../src/lua/lua.h" />
-		<Unit filename="../../src/lua/luaconf.h" />
-		<Unit filename="../../src/lua/lualib.h" />
-		<Unit filename="../../src/lua/lundump.cpp" />
-		<Unit filename="../../src/lua/lundump.h" />
-		<Unit filename="../../src/lua/lutf8lib.cpp" />
-		<Unit filename="../../src/lua/lvm.cpp" />
-		<Unit filename="../../src/lua/lvm.h" />
-		<Unit filename="../../src/lua/lzio.cpp" />
-		<Unit filename="../../src/lua/lzio.h" />
+		<Unit filename="../../src/modules/lua/lapi.c" />
+		<Unit filename="../../src/modules/lua/lapi.h" />
+		<Unit filename="../../src/modules/lua/lauxlib.c" />
+		<Unit filename="../../src/modules/lua/lauxlib.h" />
+		<Unit filename="../../src/modules/lua/lbaselib.c" />
+		<Unit filename="../../src/modules/lua/lcode.c" />
+		<Unit filename="../../src/modules/lua/lcode.h" />
+		<Unit filename="../../src/modules/lua/lcorolib.c" />
+		<Unit filename="../../src/modules/lua/lctype.c" />
+		<Unit filename="../../src/modules/lua/lctype.h" />
+		<Unit filename="../../src/modules/lua/ldblib.c" />
+		<Unit filename="../../src/modules/lua/ldebug.c" />
+		<Unit filename="../../src/modules/lua/ldebug.h" />
+		<Unit filename="../../src/modules/lua/ldo.c" />
+		<Unit filename="../../src/modules/lua/ldo.h" />
+		<Unit filename="../../src/modules/lua/ldump.c" />
+		<Unit filename="../../src/modules/lua/lfunc.c" />
+		<Unit filename="../../src/modules/lua/lfunc.h" />
+		<Unit filename="../../src/modules/lua/lgc.c" />
+		<Unit filename="../../src/modules/lua/lgc.h" />
+		<Unit filename="../../src/modules/lua/ljumptab.h" />
+		<Unit filename="../../src/modules/lua/liolib.c" />
+		<Unit filename="../../src/modules/lua/llex.c" />
+		<Unit filename="../../src/modules/lua/llex.h" />
+		<Unit filename="../../src/modules/lua/llimits.h" />
+		<Unit filename="../../src/modules/lua/lmathlib.c" />
+		<Unit filename="../../src/modules/lua/lmem.c" />
+		<Unit filename="../../src/modules/lua/lmem.h" />
+		<Unit filename="../../src/modules/lua/loadlib.c" />
+		<Unit filename="../../src/modules/lua/lobject.c" />
+		<Unit filename="../../src/modules/lua/lobject.h" />
+		<Unit filename="../../src/modules/lua/lopcodes.c" />
+		<Unit filename="../../src/modules/lua/lopcodes.h" />
+		<Unit filename="../../src/modules/lua/lopnames.h" />
+		<Unit filename="../../src/modules/lua/loslib.c" />
+		<Unit filename="../../src/modules/lua/lparser.c" />
+		<Unit filename="../../src/modules/lua/lparser.h" />
+		<Unit filename="../../src/modules/lua/lprefix.h" />
+		<Unit filename="../../src/modules/lua/lstate.c" />
+		<Unit filename="../../src/modules/lua/lstate.h" />
+		<Unit filename="../../src/modules/lua/lstring.c" />
+		<Unit filename="../../src/modules/lua/lstring.h" />
+		<Unit filename="../../src/modules/lua/lstrlib.c" />
+		<Unit filename="../../src/modules/lua/ltable.c" />
+		<Unit filename="../../src/modules/lua/ltable.h" />
+		<Unit filename="../../src/modules/lua/ltablib.c" />
+		<Unit filename="../../src/modules/lua/ltm.c" />
+		<Unit filename="../../src/modules/lua/ltm.h" />
+		<Unit filename="../../src/modules/lua/lua.h" />
+		<Unit filename="../../src/modules/lua/luaconf.h" />
+		<Unit filename="../../src/modules/lua/lualib.h" />
+		<Unit filename="../../src/modules/lua/lundump.c" />
+		<Unit filename="../../src/modules/lua/lundump.h" />
+		<Unit filename="../../src/modules/lua/lutf8lib.c" />
+		<Unit filename="../../src/modules/lua/lvm.c" />
+		<Unit filename="../../src/modules/lua/lvm.h" />
+		<Unit filename="../../src/modules/lua/lzio.c" />
+		<Unit filename="../../src/modules/lua/lzio.h" />
 		<Extensions>
 			<code_completion />
 			<envvars />
diff --git a/projectfiles/CodeBlocks/tests.cbp b/projectfiles/CodeBlocks/tests.cbp
index 82701eb7971..be28d8bf971 100644
--- a/projectfiles/CodeBlocks/tests.cbp
+++ b/projectfiles/CodeBlocks/tests.cbp
@@ -68,6 +68,7 @@
 			<Add library="liblua" />
 			<Add library="libpng" />
 			<Add library="libjpeg" />
+			<Add library="libwebp" />
 			<Add library="libboost_iostreams" />
 			<Add library="libboost_bzip2" />
 			<Add library="libboost_filesystem" />
diff --git a/projectfiles/CodeBlocks/wesnoth.cbp b/projectfiles/CodeBlocks/wesnoth.cbp
index 0d5462324ab..37676333e28 100644
--- a/projectfiles/CodeBlocks/wesnoth.cbp
+++ b/projectfiles/CodeBlocks/wesnoth.cbp
@@ -67,6 +67,7 @@
 			<Add library="liblua" />
 			<Add library="libpng" />
 			<Add library="libjpeg" />
+			<Add library="libwebp" />
 			<Add library="libboost_iostreams" />
 			<Add library="libboost_bzip2" />
 			<Add library="libboost_filesystem" />