diff --git a/src/OOVPADatabase/D3D8/3911.inl b/src/OOVPADatabase/D3D8/3911.inl
index 77ddccd7..3b82b644 100644
--- a/src/OOVPADatabase/D3D8/3911.inl
+++ b/src/OOVPADatabase/D3D8/3911.inl
@@ -148,7 +148,9 @@ OOVPA_END;
 OOVPA_NO_XREF(D3DDevice_SetTexture, 3911, 28)
     {
 #else
-OOVPA_XREF(D3DDevice_SetTexture, 3911, 1 + 28,
+OOVPA_XREF(D3DDevice_SetTexture,
+           3911,
+           1 + 28,
            XRefOne)
 {
 
@@ -386,7 +388,9 @@ OOVPA_SIG_MATCH(
 OOVPA_NO_XREF(D3DDevice_GetDepthStencilSurface, 3911, 18)
     {
 #else
-OOVPA_XREF(D3DDevice_GetDepthStencilSurface, 3911, 1 + 18,
+OOVPA_XREF(D3DDevice_GetDepthStencilSurface,
+           3911,
+           1 + 18,
            XRefOne)
 {
 
@@ -1566,7 +1570,9 @@ OOVPA_SIG_MATCH(
 OOVPA_NO_XREF(D3DDevice_SetRenderTarget, 3911, 11)
     {
 #else
-OOVPA_XREF(D3DDevice_SetRenderTarget, 3911, 1 + 11,
+OOVPA_XREF(D3DDevice_SetRenderTarget,
+           3911,
+           1 + 11,
            XRefOne)
 {
 
@@ -1763,7 +1769,9 @@ OOVPA_SIG_MATCH(
 OOVPA_NO_XREF(D3DDevice_SetPixelShader, 3911, 11)
     {
 #else
-OOVPA_XREF(D3DDevice_SetPixelShader, 3911, 1 + 11,
+OOVPA_XREF(D3DDevice_SetPixelShader,
+           3911,
+           1 + 11,
            XRefOne)
 {
 
@@ -2129,7 +2137,9 @@ OOVPA_SIG_MATCH(
 OOVPA_NO_XREF(D3DDevice_SetPalette, 3911, 12)
     {
 #else
-OOVPA_XREF(D3DDevice_SetPalette, 3911, 1 + 12,
+OOVPA_XREF(D3DDevice_SetPalette,
+           3911,
+           1 + 12,
            XRefOne)
 {
 
@@ -2872,11 +2882,15 @@ OOVPA_SIG_MATCH(
 // * D3DDevice_GetRenderTarget
 // ******************************************************************
 #ifndef WIP_LessVertexPatching
-OOVPA_XREF(D3DDevice_GetRenderTarget, 3911, 1 + 19,
+OOVPA_XREF(D3DDevice_GetRenderTarget,
+           3911,
+           1 + 19,
            XRefOne)
     {
 #else
-OOVPA_XREF(D3DDevice_GetRenderTarget, 3911, 2 + 19,
+OOVPA_XREF(D3DDevice_GetRenderTarget,
+           3911,
+           2 + 19,
            XRefTwo)
 {
 
diff --git a/src/OOVPADatabase/D3D8/3947.inl b/src/OOVPADatabase/D3D8/3947.inl
index 4f1debb2..b2ac34e5 100644
--- a/src/OOVPADatabase/D3D8/3947.inl
+++ b/src/OOVPADatabase/D3D8/3947.inl
@@ -30,7 +30,9 @@
 OOVPA_NO_XREF(D3DDevice_SetRenderTarget, 3947, 11)
     {
 #else
-OOVPA_XREF(D3DDevice_SetRenderTarget, 3947, 1 + 11,
+OOVPA_XREF(D3DDevice_SetRenderTarget,
+           3947,
+           1 + 11,
            XRefOne)
 {
 
diff --git a/src/OOVPADatabase/D3D8/4034.inl b/src/OOVPADatabase/D3D8/4034.inl
index 4e055a58..e11f9a45 100644
--- a/src/OOVPADatabase/D3D8/4034.inl
+++ b/src/OOVPADatabase/D3D8/4034.inl
@@ -917,7 +917,9 @@ OOVPA_END;
 OOVPA_NO_XREF(D3DDevice_SetPalette, 4034, 12)
     {
 #else
-OOVPA_XREF(D3DDevice_SetPalette, 4034, 1 + 12,
+OOVPA_XREF(D3DDevice_SetPalette,
+           4034,
+           1 + 12,
            XRefOne)
 {
 
@@ -1253,8 +1255,7 @@ OOVPA_SIG_MATCH(
 OOVPA_NO_XREF(D3DDevice_SetRenderTarget, 4034, 10)
     {
 #else
-OOVPA_XREF(D3DDevice_SetRenderTarget, 4034, 1 + 10,
-           XRefOne)
+OOVPA_XREF(D3DDevice_SetRenderTarget, 4034, 1 + 10, XRefOne)
 {
 
     XREF_ENTRY(0x17, XREF_OFFSET_D3DDEVICE_M_RENDERTARGET), // Derived TODO : Verify offset
@@ -1281,7 +1282,9 @@ OOVPA_END;
 OOVPA_NO_XREF(D3DDevice_SetPixelShader, 4034, 12)
     {
 #else
-OOVPA_XREF(D3DDevice_SetPixelShader, 4034, 1 + 12,
+OOVPA_XREF(D3DDevice_SetPixelShader,
+           4034,
+           1 + 12,
            XRefOne)
 {
 
@@ -1425,7 +1428,9 @@ OOVPA_SIG_MATCH(
 OOVPA_NO_XREF(D3DDevice_SetRenderState_MultiSampleMode, 4034, 12)
     {
 #else
-OOVPA_XREF(D3DDevice_SetRenderState_MultiSampleMode, 4034, 1 + 8,
+OOVPA_XREF(D3DDevice_SetRenderState_MultiSampleMode,
+           4034,
+           1 + 8,
            XRefOne)
 {
 
@@ -1462,11 +1467,15 @@ OOVPA_END;
 // ******************************************************************
 // Generic OOVPA as of 4034 and newer.
 #ifndef WIP_LessVertexPatching
-OOVPA_XREF(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 4034, 1 + 10,
+OOVPA_XREF(D3DDevice_SetRenderState_MultiSampleRenderTargetMode,
+           4034,
+           1 + 10,
            XRefOne)
     {
 #else
-OOVPA_XREF(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 4034, 2 + 10,
+OOVPA_XREF(D3DDevice_SetRenderState_MultiSampleRenderTargetMode,
+           4034,
+           2 + 10,
            XRefTwo)
 {
 #endif
diff --git a/src/OOVPADatabase/D3D8/4039.inl b/src/OOVPADatabase/D3D8/4039.inl
index 359551f8..ad69247d 100644
--- a/src/OOVPADatabase/D3D8/4039.inl
+++ b/src/OOVPADatabase/D3D8/4039.inl
@@ -92,7 +92,9 @@ OOVPA_SIG_MATCH(
 OOVPA_NO_XREF(D3DDevice_SetRenderTarget, 4039, 11)
     {
 #else
-OOVPA_XREF(D3DDevice_SetRenderTarget, 4039, 1 + 11,
+OOVPA_XREF(D3DDevice_SetRenderTarget,
+           4039,
+           1 + 11,
            XRefOne)
 {
 
diff --git a/src/OOVPADatabase/D3D8/4361.inl b/src/OOVPADatabase/D3D8/4361.inl
index b4c401f9..c3b9f0f7 100644
--- a/src/OOVPADatabase/D3D8/4361.inl
+++ b/src/OOVPADatabase/D3D8/4361.inl
@@ -77,7 +77,9 @@ OOVPA_SIG_MATCH(
 OOVPA_NO_XREF(D3DDevice_SetTexture, 4361, 28)
     {
 #else
-OOVPA_XREF(D3DDevice_SetTexture, 4361, 1 + 26,
+OOVPA_XREF(D3DDevice_SetTexture,
+           4361,
+           1 + 26,
            XRefOne)
 {
 
diff --git a/src/OOVPADatabase/D3D8/4627.inl b/src/OOVPADatabase/D3D8/4627.inl
index ae24ca41..f9999223 100644
--- a/src/OOVPADatabase/D3D8/4627.inl
+++ b/src/OOVPADatabase/D3D8/4627.inl
@@ -129,7 +129,9 @@ OOVPA_SIG_MATCH(
 OOVPA_NO_XREF(D3D_CommonSetRenderTarget, 4627, 12)
     {
 #else
-OOVPA_XREF(D3D_CommonSetRenderTarget, 4627, 1 + 12,
+OOVPA_XREF(D3D_CommonSetRenderTarget,
+           4627,
+           1 + 12,
            XRefOne)
 {
 
@@ -359,11 +361,15 @@ OOVPA_SIG_MATCH(
 // * D3DDevice_GetRenderTarget2
 // ******************************************************************
 #ifndef WIP_LessVertexPatching
-OOVPA_XREF(D3DDevice_GetRenderTarget2, 4627, 2 + 8,
+OOVPA_XREF(D3DDevice_GetRenderTarget2,
+           4627,
+           2 + 8,
            XRefTwo)
     {
 #else
-OOVPA_XREF(D3DDevice_GetRenderTarget2, 4627, 3 + 8,
+OOVPA_XREF(D3DDevice_GetRenderTarget2,
+           4627,
+           3 + 8,
            XRefThree)
 {
 #endif
@@ -428,7 +434,9 @@ OOVPA_SIG_MATCH(
 OOVPA_NO_XREF(D3DDevice_GetDepthStencilSurface2, 4627, 20)
     {
 #else
-OOVPA_XREF(D3DDevice_GetDepthStencilSurface2, 4627, 1 + 20,
+OOVPA_XREF(D3DDevice_GetDepthStencilSurface2,
+           4627,
+           1 + 20,
            XRefOne)
 {
 
@@ -739,7 +747,9 @@ OOVPA_SIG_MATCH(
 OOVPA_NO_XREF(D3DDevice_SetPixelShader, 4627, 16)
     {
 #else
-OOVPA_XREF(D3DDevice_SetPixelShader, 4627, 1 + 16,
+OOVPA_XREF(D3DDevice_SetPixelShader,
+           4627,
+           1 + 16,
            XRefOne)
 {
 
diff --git a/src/OOVPADatabase/D3D8/4831.inl b/src/OOVPADatabase/D3D8/4831.inl
index 87a78aad..6291e752 100644
--- a/src/OOVPADatabase/D3D8/4831.inl
+++ b/src/OOVPADatabase/D3D8/4831.inl
@@ -54,7 +54,9 @@ OOVPA_SIG_MATCH(
 OOVPA_NO_XREF(D3DDevice_SetTexture, 4831, 15)
     {
 #else
-OOVPA_XREF(D3DDevice_SetTexture, 4831, 1 + 15,
+OOVPA_XREF(D3DDevice_SetTexture,
+           4831,
+           1 + 15,
            XRefOne)
     {
 
diff --git a/src/OOVPADatabase/D3D8/5028.inl b/src/OOVPADatabase/D3D8/5028.inl
index 08401097..ab2060f7 100644
--- a/src/OOVPADatabase/D3D8/5028.inl
+++ b/src/OOVPADatabase/D3D8/5028.inl
@@ -344,7 +344,9 @@ OOVPA_SIG_MATCH(
 OOVPA_NO_XREF(D3D_CommonSetRenderTarget, 5028, 12)
     {
 #else
-OOVPA_XREF(D3D_CommonSetRenderTarget, 5028, 1 + 12,
+OOVPA_XREF(D3D_CommonSetRenderTarget,
+           5028,
+           1 + 12,
            XRefOne)
 {
 
diff --git a/src/OOVPADatabase/D3D8/5233.inl b/src/OOVPADatabase/D3D8/5233.inl
index 8f10e72a..930f6c7c 100644
--- a/src/OOVPADatabase/D3D8/5233.inl
+++ b/src/OOVPADatabase/D3D8/5233.inl
@@ -87,7 +87,9 @@ OOVPA_SIG_MATCH(
 OOVPA_NO_XREF(D3DDevice_SetRenderTargetFast, 5233, 27)
     {
 #else
-OOVPA_XREF(D3DDevice_SetRenderTargetFast, 5233, 1 + 27,
+OOVPA_XREF(D3DDevice_SetRenderTargetFast,
+           5233,
+           1 + 27,
            XRefOne)
 {
 
diff --git a/src/OOVPADatabase/D3D8/5344.inl b/src/OOVPADatabase/D3D8/5344.inl
index cd31ecd0..14aa4355 100644
--- a/src/OOVPADatabase/D3D8/5344.inl
+++ b/src/OOVPADatabase/D3D8/5344.inl
@@ -285,7 +285,9 @@ OOVPA_SIG_MATCH(
 OOVPA_NO_XREF(D3DDevice_SetRenderTarget, 5344, 13)
     {
 #else
-OOVPA_XREF(D3DDevice_SetRenderTarget, 5344, 1 + 13,
+OOVPA_XREF(D3DDevice_SetRenderTarget,
+           5344,
+           1 + 13,
            XRefOne)
 {
 
diff --git a/src/OOVPADatabase/D3D8/5455.inl b/src/OOVPADatabase/D3D8/5455.inl
index 750c2173..f80c140c 100644
--- a/src/OOVPADatabase/D3D8/5455.inl
+++ b/src/OOVPADatabase/D3D8/5455.inl
@@ -315,7 +315,9 @@ OOVPA_SIG_MATCH(
 OOVPA_NO_XREF(D3DDevice_SetRenderTarget, 5455, 13)
     {
 #else
-OOVPA_XREF(D3DDevice_SetRenderTarget, 5455, 1 + 13,
+OOVPA_XREF(D3DDevice_SetRenderTarget,
+           5455,
+           1 + 13,
            XRefOne)
 {
 
diff --git a/src/OOVPADatabase/D3D8LTCG/3911.inl b/src/OOVPADatabase/D3D8LTCG/3911.inl
index b454f1a6..c3fae6ed 100644
--- a/src/OOVPADatabase/D3D8LTCG/3911.inl
+++ b/src/OOVPADatabase/D3D8LTCG/3911.inl
@@ -981,7 +981,9 @@ OOVPA_SIG_MATCH(
 OOVPA_NO_XREF(D3DDevice_SetRenderTarget, 1024, 11)
     {
 #else
-OOVPA_XREF(D3DDevice_SetRenderTarget, 1024, 1 + 11,
+OOVPA_XREF(D3DDevice_SetRenderTarget,
+           1024,
+           1 + 11,
            XRefOne)
 {
 
diff --git a/src/OOVPADatabase/D3D8LTCG/4627.inl b/src/OOVPADatabase/D3D8LTCG/4627.inl
index 43265c8c..da31187a 100644
--- a/src/OOVPADatabase/D3D8LTCG/4627.inl
+++ b/src/OOVPADatabase/D3D8LTCG/4627.inl
@@ -1081,7 +1081,9 @@ OOVPA_SIG_MATCH(
 OOVPA_NO_XREF(D3D_CommonSetRenderTarget, 1024, 10)
     {
 #else
-OOVPA_XREF(D3D_CommonSetRenderTarget, 1024, 1 + 10,
+OOVPA_XREF(D3D_CommonSetRenderTarget,
+           1024,
+           1 + 10,
            XRefOne)
 {
 
diff --git a/src/OOVPADatabase/DSound/4039.inl b/src/OOVPADatabase/DSound/4039.inl
index c7fe04b5..0883ac34 100644
--- a/src/OOVPADatabase/DSound/4039.inl
+++ b/src/OOVPADatabase/DSound/4039.inl
@@ -119,7 +119,9 @@ OOVPA_SIG_MATCH(
 // ******************************************************************
 // * CDirectSound_DoWork
 // ******************************************************************
-OOVPA_XREF(CDirectSound_DoWork, 4039, 1 + 9,
+OOVPA_XREF(CDirectSound_DoWork,
+           4039,
+           1 + 9,
            XRefOne)
     {
 
@@ -497,7 +499,9 @@ OOVPA_SIG_MATCH(
 // * CDirectSoundBuffer::SetBufferData
 // ******************************************************************
 // Verified with Agent Under Fire.
-OOVPA_XREF(CDirectSoundBuffer_SetBufferData, 4039, 2 + 11,
+OOVPA_XREF(CDirectSoundBuffer_SetBufferData,
+           4039,
+           2 + 11,
            XRefTwo)
     {