diff --git a/src/lightmap/common.h b/src/lightmap/common.h
index 5457b18..e80031b 100644
--- a/src/lightmap/common.h
+++ b/src/lightmap/common.h
@@ -152,7 +152,7 @@ typedef union
 #define d_inline
 #endif
 
-#include "kexlib/memHeap.h"
+#include "kexlib/memheap.h"
 #include "kexlib/kstring.h"
 #include "kexlib/math/mathlib.h"
 
diff --git a/src/lightmap/kexlib/binfile.cpp b/src/lightmap/kexlib/binfile.cpp
index cd868de..66fb4c7 100644
--- a/src/lightmap/kexlib/binfile.cpp
+++ b/src/lightmap/kexlib/binfile.cpp
@@ -31,7 +31,7 @@
 //-----------------------------------------------------------------------------
 
 #include "lightmap/common.h"
-#include "lightmap/kexlib/binFile.h"
+#include "lightmap/kexlib/binfile.h"
 
 //
 // kexBinFile::kexBinFile
diff --git a/src/lightmap/lightmap.cpp b/src/lightmap/lightmap.cpp
index a311b45..2411875 100644
--- a/src/lightmap/lightmap.cpp
+++ b/src/lightmap/lightmap.cpp
@@ -33,10 +33,10 @@
 #include "common.h"
 #include "surfaces.h"
 #include "trace.h"
-#include "mapData.h"
+#include "mapdata.h"
 #include "lightmap.h"
 #include "worker.h"
-#include "kexlib/binFile.h"
+#include "kexlib/binfile.h"
 #include "wad.h"
 #include "framework/templates.h"
 #include <map>
diff --git a/src/lightmap/lightsurface.cpp b/src/lightmap/lightsurface.cpp
index 78723c2..1f8da9f 100644
--- a/src/lightmap/lightsurface.cpp
+++ b/src/lightmap/lightsurface.cpp
@@ -33,9 +33,9 @@
 //-----------------------------------------------------------------------------
 
 #include "common.h"
-#include "mapData.h"
+#include "mapdata.h"
 #include "trace.h"
-#include "lightSurface.h"
+#include "lightsurface.h"
 
 //
 // kexLightSurface::kexLightSurface
diff --git a/src/lightmap/mapdata.cpp b/src/lightmap/mapdata.cpp
index df209eb..93ebf9b 100644
--- a/src/lightmap/mapdata.cpp
+++ b/src/lightmap/mapdata.cpp
@@ -33,8 +33,8 @@
 #include "common.h"
 #include "wad.h"
 #include "kexlib/parser.h"
-#include "mapData.h"
-#include "lightSurface.h"
+#include "mapdata.h"
+#include "lightsurface.h"
 
 static const kexVec3 defaultSunColor(1, 1, 1);
 static const kexVec3 defaultSunDirection(0.45f, 0.3f, 0.9f);
diff --git a/src/lightmap/mapdata.h b/src/lightmap/mapdata.h
index cbb3b6a..edbd4ec 100644
--- a/src/lightmap/mapdata.h
+++ b/src/lightmap/mapdata.h
@@ -30,4 +30,4 @@
 #include "framework/zdray.h"
 #include "level/level.h"
 #include "surfaces.h"
-#include "lightSurface.h"
+#include "lightsurface.h"
diff --git a/src/lightmap/surfaces.cpp b/src/lightmap/surfaces.cpp
index 233e830..3708b43 100644
--- a/src/lightmap/surfaces.cpp
+++ b/src/lightmap/surfaces.cpp
@@ -31,7 +31,7 @@
 //-----------------------------------------------------------------------------
 
 #include "common.h"
-#include "mapData.h"
+#include "mapdata.h"
 #include "surfaces.h"
 
 //#define EXPORT_OBJ
diff --git a/src/lightmap/trace.cpp b/src/lightmap/trace.cpp
index 23e363b..f8b1211 100644
--- a/src/lightmap/trace.cpp
+++ b/src/lightmap/trace.cpp
@@ -32,7 +32,7 @@
 //-----------------------------------------------------------------------------
 
 #include "common.h"
-#include "mapData.h"
+#include "mapdata.h"
 #include "trace.h"
 
 //