diff --git a/reactos/win32ss/gdi/diblib/BitBlt_MERGEPAINT.c b/reactos/win32ss/gdi/diblib/BitBlt_MERGEPAINT.c
index 14ee4334afb..f7cf86321d3 100644
--- a/reactos/win32ss/gdi/diblib/BitBlt_MERGEPAINT.c
+++ b/reactos/win32ss/gdi/diblib/BitBlt_MERGEPAINT.c
@@ -10,7 +10,7 @@
 
 #define _DibDoRop(pBltData, M, D, S, P) ROP_MERGEPAINT(D,S,P)
 
-#include "diblib_allsrcbpp.h"
+#include "DibLib_AllSrcBPP.h"
 
 VOID
 FASTCALL
diff --git a/reactos/win32ss/gdi/diblib/BitBlt_NOTPATCOPY.c b/reactos/win32ss/gdi/diblib/BitBlt_NOTPATCOPY.c
index 91787f95e21..f67924d35ed 100644
--- a/reactos/win32ss/gdi/diblib/BitBlt_NOTPATCOPY.c
+++ b/reactos/win32ss/gdi/diblib/BitBlt_NOTPATCOPY.c
@@ -10,7 +10,7 @@
 
 #define _DibDoRop(pBltData, M, D, S, P) (~(P))
 
-#include "diblib_alldstbpp.h"
+#include "DibLib_AllDstBPP.h"
 
 extern PFN_DIBFUNCTION gapfnBitBlt_PATCOPY_Solid[];
 
diff --git a/reactos/win32ss/gdi/diblib/BitBlt_NOTSRCCOPY.c b/reactos/win32ss/gdi/diblib/BitBlt_NOTSRCCOPY.c
index 2d9441d9b8d..f53e0469915 100644
--- a/reactos/win32ss/gdi/diblib/BitBlt_NOTSRCCOPY.c
+++ b/reactos/win32ss/gdi/diblib/BitBlt_NOTSRCCOPY.c
@@ -10,7 +10,7 @@
 
 #define _DibDoRop(pBltData, M, D, S, P) ROP_NOTSRCCOPY(D,S,P)
 
-#include "diblib_allsrcbpp.h"
+#include "DibLib_AllSrcBPP.h"
 
 VOID
 FASTCALL
diff --git a/reactos/win32ss/gdi/diblib/BitBlt_NOTSRCERASE.c b/reactos/win32ss/gdi/diblib/BitBlt_NOTSRCERASE.c
index 51a50c1fe6b..4cdb098224c 100644
--- a/reactos/win32ss/gdi/diblib/BitBlt_NOTSRCERASE.c
+++ b/reactos/win32ss/gdi/diblib/BitBlt_NOTSRCERASE.c
@@ -10,7 +10,7 @@
 
 #define _DibDoRop(pBltData, M, D, S, P) ROP_NOTSRCERASE(D,S,P)
 
-#include "diblib_allsrcbpp.h"
+#include "DibLib_AllSrcBPP.h"
 
 VOID
 FASTCALL
diff --git a/reactos/win32ss/gdi/diblib/BitBlt_PATCOPY.c b/reactos/win32ss/gdi/diblib/BitBlt_PATCOPY.c
index 5adc722a1c6..b958aaf5d6b 100644
--- a/reactos/win32ss/gdi/diblib/BitBlt_PATCOPY.c
+++ b/reactos/win32ss/gdi/diblib/BitBlt_PATCOPY.c
@@ -10,12 +10,12 @@
 
 #define _DibDoRop(pBltData, M, D, S, P) ROP_PATCOPY(D,S,P)
 
-#include "diblib_alldstbpp.h"
+#include "DibLib_AllDstBPP.h"
 
 #undef __FUNCTIONNAME
 #define __FUNCTIONNAME BitBlt_PATCOPY_Solid
 #define __USES_SOLID_BRUSH 1
-#include "diblib_alldstbpp.h"
+#include "DibLib_AllDstBPP.h"
 
 VOID
 FASTCALL
diff --git a/reactos/win32ss/gdi/diblib/BitBlt_PATINVERT.c b/reactos/win32ss/gdi/diblib/BitBlt_PATINVERT.c
index 311614ca399..1d7ee1f48fa 100644
--- a/reactos/win32ss/gdi/diblib/BitBlt_PATINVERT.c
+++ b/reactos/win32ss/gdi/diblib/BitBlt_PATINVERT.c
@@ -10,12 +10,12 @@
 
 #define _DibDoRop(pBltData, M, D, S, P) ROP_PATINVERT(D,S,P)
 
-#include "diblib_alldstbpp.h"
+#include "DibLib_AllDstBPP.h"
 
 #undef __FUNCTIONNAME
 #define __FUNCTIONNAME BitBlt_PATINVERT_Solid
 #define __USES_SOLID_BRUSH 1
-#include "diblib_alldstbpp.h"
+#include "DibLib_AllDstBPP.h"
 
 VOID
 FASTCALL
diff --git a/reactos/win32ss/gdi/diblib/BitBlt_PATPAINT.c b/reactos/win32ss/gdi/diblib/BitBlt_PATPAINT.c
index e6e0fa17d02..46f57233575 100644
--- a/reactos/win32ss/gdi/diblib/BitBlt_PATPAINT.c
+++ b/reactos/win32ss/gdi/diblib/BitBlt_PATPAINT.c
@@ -10,12 +10,12 @@
 
 #define _DibDoRop(pBltData, M, D, S, P) ROP_PATPAINT(D,S,P)
 
-#include "diblib_allsrcbpp.h"
+#include "DibLib_AllSrcBPP.h"
 
 #undef __FUNCTIONNAME
 #define __FUNCTIONNAME BitBlt_PATPAINT_Solid
 #define __USES_SOLID_BRUSH 1
-#include "diblib_allsrcbpp.h"
+#include "DibLib_AllSrcBPP.h"
 
 VOID
 FASTCALL
diff --git a/reactos/win32ss/gdi/diblib/BitBlt_SRCAND.c b/reactos/win32ss/gdi/diblib/BitBlt_SRCAND.c
index bb56487bf11..03d36646d7a 100644
--- a/reactos/win32ss/gdi/diblib/BitBlt_SRCAND.c
+++ b/reactos/win32ss/gdi/diblib/BitBlt_SRCAND.c
@@ -10,7 +10,7 @@
 
 #define _DibDoRop(pBltData, M, D, S, P) ROP_SRCAND(D,S,P)
 
-#include "diblib_allsrcbpp.h"
+#include "DibLib_AllSrcBPP.h"
 
 VOID
 FASTCALL
diff --git a/reactos/win32ss/gdi/diblib/BitBlt_SRCCOPY.c b/reactos/win32ss/gdi/diblib/BitBlt_SRCCOPY.c
index ef042ea6d8d..b937094aff3 100644
--- a/reactos/win32ss/gdi/diblib/BitBlt_SRCCOPY.c
+++ b/reactos/win32ss/gdi/diblib/BitBlt_SRCCOPY.c
@@ -50,10 +50,9 @@ Dib_BitBlt_SRCCOPY_S32_D32_EqSurf(PBLTDATA pBltData)
 #define Dib_BitBlt_SRCCOPY_S32_D32_EqSurf Dib_BitBlt_SRCCOPY_EqSurf
 #endif
 
+/* This definition will be checked against in DibLib_BitBlt.h
+   for all "redirected" functions */
 #define Dib_BitBlt_SRCCOPY_EqSurf_manual 1
-// #define Dib_BitBlt_SRCCOPY_S16_D16_EqSurf_manual 1
-// #define Dib_BitBlt_SRCCOPY_S24_D24_EqSurf_manual 1
-// #define Dib_BitBlt_SRCCOPY_S32_D32_EqSurf_manual 1
 
 #define __USES_SOURCE 1
 #define __USES_PATTERN 0
@@ -64,13 +63,12 @@ Dib_BitBlt_SRCCOPY_S32_D32_EqSurf(PBLTDATA pBltData)
 
 #define _DibDoRop(pBltData, M, D, S, P) ROP_SRCCOPY(D,S,P)
 
-#include "diblib_allsrcbpp.h"
+#include "DibLib_AllSrcBPP.h"
 
 VOID
 FASTCALL
 Dib_BitBlt_SRCCOPY(PBLTDATA pBltData)
 {
-    // TODO: XLATEless same-surface variants
     gapfnBitBlt_SRCCOPY[pBltData->siDst.iFormat][pBltData->siSrc.iFormat](pBltData);
 }
 
diff --git a/reactos/win32ss/gdi/diblib/BitBlt_SRCERASE.c b/reactos/win32ss/gdi/diblib/BitBlt_SRCERASE.c
index 268af45b0c3..2470fb5b166 100644
--- a/reactos/win32ss/gdi/diblib/BitBlt_SRCERASE.c
+++ b/reactos/win32ss/gdi/diblib/BitBlt_SRCERASE.c
@@ -10,7 +10,7 @@
 
 #define _DibDoRop(pBltData, M, D, S, P) ROP_SRCERASE(D,S,P)
 
-#include "diblib_allsrcbpp.h"
+#include "DibLib_AllSrcBPP.h"
 
 VOID
 FASTCALL
diff --git a/reactos/win32ss/gdi/diblib/BitBlt_SRCINVERT.c b/reactos/win32ss/gdi/diblib/BitBlt_SRCINVERT.c
index 4bf6cfe42fe..a504fb9af65 100644
--- a/reactos/win32ss/gdi/diblib/BitBlt_SRCINVERT.c
+++ b/reactos/win32ss/gdi/diblib/BitBlt_SRCINVERT.c
@@ -10,7 +10,7 @@
 
 #define _DibDoRop(pBltData, M, D, S, P) ROP_SRCINVERT(D,S,P)
 
-#include "diblib_allsrcbpp.h"
+#include "DibLib_AllSrcBPP.h"
 
 VOID
 FASTCALL
diff --git a/reactos/win32ss/gdi/diblib/BitBlt_SRCPAINT.c b/reactos/win32ss/gdi/diblib/BitBlt_SRCPAINT.c
index fe3cc125378..c01258ff584 100644
--- a/reactos/win32ss/gdi/diblib/BitBlt_SRCPAINT.c
+++ b/reactos/win32ss/gdi/diblib/BitBlt_SRCPAINT.c
@@ -10,7 +10,7 @@
 
 #define _DibDoRop(pBltData, M, D, S, P) ROP_SRCPAINT(D,S,P)
 
-#include "diblib_allsrcbpp.h"
+#include "DibLib_AllSrcBPP.h"
 
 VOID
 FASTCALL
diff --git a/reactos/win32ss/gdi/diblib/DibLib.h b/reactos/win32ss/gdi/diblib/DibLib.h
index 3f1d00c8204..b910b7da9d6 100644
--- a/reactos/win32ss/gdi/diblib/DibLib.h
+++ b/reactos/win32ss/gdi/diblib/DibLib.h
@@ -30,7 +30,6 @@ extern const BYTE ajShift4[2];
 
 #define __PASTE_(s1,s2) s1##s2
 #define __PASTE(s1,s2) __PASTE_(s1,s2)
-#define EVALUATE(x) x
 
 #define __DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp) Dib_ ## name ## _S ## src_bpp ## _D ## dst_bpp
 #define __DIB_FUNCTION_NAME_SRCDST(name, src_bpp, dst_bpp) __DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp)
diff --git a/reactos/win32ss/gdi/diblib/DibLib_AllDstBPP.h b/reactos/win32ss/gdi/diblib/DibLib_AllDstBPP.h
index b9a5475051b..556d154a046 100644
--- a/reactos/win32ss/gdi/diblib/DibLib_AllDstBPP.h
+++ b/reactos/win32ss/gdi/diblib/DibLib_AllDstBPP.h
@@ -8,27 +8,27 @@
 #endif
 
 #define _DEST_BPP 1
-#include "diblib_bitblt.h"
+#include "DibLib_BitBlt.h"
 #undef _DEST_BPP
 
 #define _DEST_BPP 4
-#include "diblib_bitblt.h"
+#include "DibLib_BitBlt.h"
 #undef _DEST_BPP
 
 #define _DEST_BPP 8
-#include "diblib_bitblt.h"
+#include "DibLib_BitBlt.h"
 #undef _DEST_BPP
 
 #define _DEST_BPP 16
-#include "diblib_bitblt.h"
+#include "DibLib_BitBlt.h"
 #undef _DEST_BPP
 
 #define _DEST_BPP 24
-#include "diblib_bitblt.h"
+#include "DibLib_BitBlt.h"
 #undef _DEST_BPP
 
 #define _DEST_BPP 32
-#include "diblib_bitblt.h"
+#include "DibLib_BitBlt.h"
 #undef _DEST_BPP
 
 #if (__USES_SOURCE == 0)
diff --git a/reactos/win32ss/gdi/diblib/DibLib_AllSrcBPP.h b/reactos/win32ss/gdi/diblib/DibLib_AllSrcBPP.h
index f25b6dfadc7..e11ef0ab554 100644
--- a/reactos/win32ss/gdi/diblib/DibLib_AllSrcBPP.h
+++ b/reactos/win32ss/gdi/diblib/DibLib_AllSrcBPP.h
@@ -4,27 +4,27 @@
 #endif
 
 #define _SOURCE_BPP 1
-#include "diblib_alldstbpp.h"
+#include "DibLib_AllDstBPP.h"
 #undef _SOURCE_BPP
 
 #define _SOURCE_BPP 4
-#include "diblib_alldstbpp.h"
+#include "DibLib_AllDstBPP.h"
 #undef _SOURCE_BPP
 
 #define _SOURCE_BPP 8
-#include "diblib_alldstbpp.h"
+#include "DibLib_AllDstBPP.h"
 #undef _SOURCE_BPP
 
 #define _SOURCE_BPP 16
-#include "diblib_alldstbpp.h"
+#include "DibLib_AllDstBPP.h"
 #undef _SOURCE_BPP
 
 #define _SOURCE_BPP 24
-#include "diblib_alldstbpp.h"
+#include "DibLib_AllDstBPP.h"
 #undef _SOURCE_BPP
 
 #define _SOURCE_BPP 32
-#include "diblib_alldstbpp.h"
+#include "DibLib_AllDstBPP.h"
 #undef _SOURCE_BPP
 
 #undef _DibXlate
@@ -33,12 +33,12 @@
 
 #undef __DIB_FUNCTION_NAME
 #define __DIB_FUNCTION_NAME __DIB_FUNCTION_NAME_SRCDSTEQ
-#include "diblib_alldstbpp.h"
+#include "DibLib_AllDstBPP.h"
 
 #define _NextPixel_ _NextPixelR2L_
 #undef __DIB_FUNCTION_NAME
 #define __DIB_FUNCTION_NAME __DIB_FUNCTION_NAME_SRCDSTEQR2L
-#include "diblib_alldstbpp.h"
+#include "DibLib_AllDstBPP.h"
 #undef _SOURCE_BPP
 #undef _NextPixel_
 
diff --git a/reactos/win32ss/gdi/diblib/MaskBlt.c b/reactos/win32ss/gdi/diblib/MaskBlt.c
index 1c66b09b389..28d4c6b606b 100644
--- a/reactos/win32ss/gdi/diblib/MaskBlt.c
+++ b/reactos/win32ss/gdi/diblib/MaskBlt.c
@@ -10,12 +10,12 @@
 
 #define _DibDoRop(pBltData, M, D, S, P) pBltData->apfnDoRop[M](D,S,P)
 
-#include "diblib_allsrcbpp.h"
+#include "DibLib_AllSrcBPP.h"
 
 #undef __FUNCTIONNAME
 #define __FUNCTIONNAME MaskBlt_Solid
 #define __USES_SOLID_BRUSH 1
-#include "diblib_allsrcbpp.h"
+#include "DibLib_AllSrcBPP.h"
 
 VOID
 FASTCALL
diff --git a/reactos/win32ss/gdi/diblib/MaskPaint.c b/reactos/win32ss/gdi/diblib/MaskPaint.c
index bbd04b9ff3d..d220ec0742e 100644
--- a/reactos/win32ss/gdi/diblib/MaskPaint.c
+++ b/reactos/win32ss/gdi/diblib/MaskPaint.c
@@ -10,7 +10,7 @@
 
 #define _DibDoRop(pBltData, M, D, S, P) pBltData->apfnDoRop[M](D,0,0)
 
-#include "diblib_alldstbpp.h"
+#include "DibLib_AllDstBPP.h"
 
 VOID
 FASTCALL
diff --git a/reactos/win32ss/gdi/diblib/MaskPatBlt.c b/reactos/win32ss/gdi/diblib/MaskPatBlt.c
index 887212f91e2..e9a12ff7140 100644
--- a/reactos/win32ss/gdi/diblib/MaskPatBlt.c
+++ b/reactos/win32ss/gdi/diblib/MaskPatBlt.c
@@ -10,12 +10,12 @@
 
 #define _DibDoRop(pBltData, M, D, S, P) pBltData->apfnDoRop[M](0,0,P)
 
-#include "diblib_alldstbpp.h"
+#include "DibLib_AllDstBPP.h"
 
 #undef __FUNCTIONNAME
 #define __FUNCTIONNAME MaskPatBlt_Solid
 #define __USES_SOLID_BRUSH 1
-#include "diblib_alldstbpp.h"
+#include "DibLib_AllDstBPP.h"
 
 VOID
 FASTCALL
diff --git a/reactos/win32ss/gdi/diblib/MaskPatPaint.c b/reactos/win32ss/gdi/diblib/MaskPatPaint.c
index 292984d637e..6a2faddad48 100644
--- a/reactos/win32ss/gdi/diblib/MaskPatPaint.c
+++ b/reactos/win32ss/gdi/diblib/MaskPatPaint.c
@@ -10,12 +10,12 @@
 
 #define _DibDoRop(pBltData, M, D, S, P) pBltData->apfnDoRop[M](D,0,P)
 
-#include "diblib_alldstbpp.h"
+#include "DibLib_AllDstBPP.h"
 
 #undef __FUNCTIONNAME
 #define __FUNCTIONNAME MaskPatPaint_Solid
 #define __USES_SOLID_BRUSH 1
-#include "diblib_alldstbpp.h"
+#include "DibLib_AllDstBPP.h"
 
 VOID
 FASTCALL
diff --git a/reactos/win32ss/gdi/diblib/MaskSrcBlt.c b/reactos/win32ss/gdi/diblib/MaskSrcBlt.c
index fe992722dc7..0c44cf86d67 100644
--- a/reactos/win32ss/gdi/diblib/MaskSrcBlt.c
+++ b/reactos/win32ss/gdi/diblib/MaskSrcBlt.c
@@ -10,7 +10,7 @@
 
 #define _DibDoRop(pBltData, M, D, S, P) pBltData->apfnDoRop[M](D,S,0)
 
-#include "diblib_allsrcbpp.h"
+#include "DibLib_AllSrcBPP.h"
 
 VOID
 FASTCALL
diff --git a/reactos/win32ss/gdi/diblib/MaskSrcPaint.c b/reactos/win32ss/gdi/diblib/MaskSrcPaint.c
index 9c3d622dd38..6825837a48e 100644
--- a/reactos/win32ss/gdi/diblib/MaskSrcPaint.c
+++ b/reactos/win32ss/gdi/diblib/MaskSrcPaint.c
@@ -10,7 +10,7 @@
 
 #define _DibDoRop(pBltData, M, D, S, P) pBltData->apfnDoRop[M](D,S,0)
 
-#include "diblib_allsrcbpp.h"
+#include "DibLib_AllSrcBPP.h"
 
 VOID
 FASTCALL
diff --git a/reactos/win32ss/gdi/diblib/MaskSrcPatBlt.c b/reactos/win32ss/gdi/diblib/MaskSrcPatBlt.c
index d64774845da..ee5714bd19f 100644
--- a/reactos/win32ss/gdi/diblib/MaskSrcPatBlt.c
+++ b/reactos/win32ss/gdi/diblib/MaskSrcPatBlt.c
@@ -10,12 +10,12 @@
 
 #define _DibDoRop(pBltData, M, D, S, P) pBltData->apfnDoRop[M](D,S,P)
 
-#include "diblib_allsrcbpp.h"
+#include "DibLib_AllSrcBPP.h"
 
 #undef __FUNCTIONNAME
 #define __FUNCTIONNAME MaskSrcPatBlt_Solid
 #define __USES_SOLID_BRUSH 1
-#include "diblib_allsrcbpp.h"
+#include "DibLib_AllSrcBPP.h"
 
 VOID
 FASTCALL
diff --git a/reactos/win32ss/gdi/diblib/PatPaint.c b/reactos/win32ss/gdi/diblib/PatPaint.c
index d4fad80ac41..ba2c8d36529 100644
--- a/reactos/win32ss/gdi/diblib/PatPaint.c
+++ b/reactos/win32ss/gdi/diblib/PatPaint.c
@@ -10,12 +10,12 @@
 
 #define _DibDoRop(pBltData, M, D, S, P) pBltData->apfnDoRop[0](D,0,P)
 
-#include "diblib_alldstbpp.h"
+#include "DibLib_AllDstBPP.h"
 
 #undef __FUNCTIONNAME
 #define __FUNCTIONNAME PatPaint_Solid
 #define __USES_SOLID_BRUSH 1
-#include "diblib_alldstbpp.h"
+#include "DibLib_AllDstBPP.h"
 
 VOID
 FASTCALL
diff --git a/reactos/win32ss/gdi/diblib/SrcPaint.c b/reactos/win32ss/gdi/diblib/SrcPaint.c
index 9a332452174..4a2883d27ba 100644
--- a/reactos/win32ss/gdi/diblib/SrcPaint.c
+++ b/reactos/win32ss/gdi/diblib/SrcPaint.c
@@ -10,7 +10,7 @@
 
 #define _DibDoRop(pBltData, M, D, S, P) pBltData->apfnDoRop[0](D,S,0)
 
-#include "diblib_allsrcbpp.h"
+#include "DibLib_AllSrcBPP.h"
 
 VOID
 FASTCALL
diff --git a/reactos/win32ss/gdi/diblib/SrcPatBlt.c b/reactos/win32ss/gdi/diblib/SrcPatBlt.c
index 3d8764c56be..8cb0c40ad49 100644
--- a/reactos/win32ss/gdi/diblib/SrcPatBlt.c
+++ b/reactos/win32ss/gdi/diblib/SrcPatBlt.c
@@ -10,12 +10,12 @@
 
 #define _DibDoRop(pBltData, M, D, S, P) pBltData->apfnDoRop[0](0,S,P)
 
-#include "diblib_allsrcbpp.h"
+#include "DibLib_AllSrcBPP.h"
 
 #undef __FUNCTIONNAME
 #define __FUNCTIONNAME SrcPatBlt_Solid
 #define __USES_SOLID_BRUSH 1
-#include "diblib_allsrcbpp.h"
+#include "DibLib_AllSrcBPP.h"
 
 VOID
 FASTCALL