Fixes Upper/Lower Casing for include paths (#487)

* Fixing upper/lower case for includes

types.h, zconf.h and zlib.h were renamed so that global includes like Types.h
are not used.

CMakeLists.txt

@@ -49,7 +49,7 @@ include_directories(
   "${CMAKE_SOURCE_DIR}/Strategic"
   "${CMAKE_SOURCE_DIR}/sgp"
   "${CMAKE_SOURCE_DIR}/Ja2/Res"
-  "${CMAKE_SOURCE_DIR}/Lua"
+  "${CMAKE_SOURCE_DIR}/lua"
   "${CMAKE_SOURCE_DIR}/Laptop"
   "${CMAKE_SOURCE_DIR}/Multiplayer"
   "${CMAKE_SOURCE_DIR}/Editor"

Console/Cursors.cpp

@@ -27,7 +27,7 @@
 // Cursors.h - cursor classes
 
 //#include "stdafx.h"
-#include <Windows.h>
+#include <windows.h>
 #include <tchar.h>
 #include "Cursors.h"
 

Console/Dialogs.cpp

@@ -29,7 +29,7 @@
 // About dialog class, etc...
 
 //#include "stdafx.h"
-#include <Windows.h>
+#include <windows.h>
 
 #include "resource.h"
 #include "Console.h"

Console/FileStream.cpp

@@ -33,7 +33,7 @@
 
 //#include "stdafx.h"
 //#include <atlbase.h>
-#include <Windows.h>
+#include <windows.h>
 #include <objidl.h>
 #include "FileStream.h"
 

Editor/Button Defines.h

@@ -1,4 +1,4 @@
-#include "BuildDefines.h"
+#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef __BUTTON_DEFINES_H

Editor/Cursor Modes.cpp

@@ -7,7 +7,7 @@
 	#include "renderworld.h"
 	#include "random.h"
 	#include "worldman.h"
-	#include "interface.h"
+	#include "Interface.h"
 	#include "Isometric Utils.h"
 	#include "editscreen.h"
 	#include "EditorDefines.h"

Editor/Cursor Modes.h

@@ -1,4 +1,4 @@
-#include "BuildDefines.h"
+#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef __CURSOR_MODES_H

Editor/Editor Callback Prototypes.h

@@ -1,4 +1,4 @@
-#include "BuildDefines.h"
+#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef __EDITOR_CALLBACK_PROTOTYPES_H

Editor/Editor Modes.cpp

@@ -17,7 +17,7 @@
 	#include "environment.h"
 	#include "worlddef.h"
 	#include "Exit Grids.h"
-	#include "Worldman.h"
+	#include "worldman.h"
 
 BOOLEAN gfShowExitGrids = FALSE;
 

Editor/Editor Modes.h

@@ -1,4 +1,4 @@
-#include "BuildDefines.h"
+#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef __EDITOR_MODES_H

Editor/Editor Taskbar Creation.cpp

@@ -5,7 +5,7 @@
 	//sgp
 	#include "Button System.h"
 	#include "Font Control.h"
-	#include "debug.h"
+	#include "DEBUG.H"
 	//editor
 	#include "EditorDefines.h"
 	#include "Editor Callback Prototypes.h"
@@ -14,7 +14,7 @@
 	#include "EditorMapInfo.h"
 	//tactical
 	#include "Soldier Create.h"
-	#include "overhead types.h"
+	#include "Overhead Types.h"
 	#include "local.h"
 	#include "Text.h"
 

Editor/Editor Taskbar Creation.h

@@ -1,4 +1,4 @@
-#include "BuildDefines.h"
+#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef __EDITOR_TASKBAR_CREATION_H

Editor/Editor Taskbar Utils.cpp

@@ -11,13 +11,13 @@
 	#include "WorldDat.h"
 	#include "Render Dirty.h"
 	#include "sysutil.h"
-	#include "wordwrap.h"
+	#include "WordWrap.h"
 	#include "environment.h"
 	#include "Interface Items.h"
 	#include "Soldier Find.h"
 	#include "World Items.h"
 	#include "Text.h"
-	#include "Overhead map.h"
+	#include "overhead map.h"
 	#include "Cursor Modes.h"
 	#include "editscreen.h"
 	#include "EditorTerrain.h"

Editor/Editor Taskbar Utils.h

@@ -1,4 +1,4 @@
-#include "BuildDefines.h"
+#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef __EDITOR_TASKBAR_UTILS_H

Editor/Editor Undo.cpp

@@ -6,7 +6,7 @@
 	#include "worldman.h"
 	#include "smooth.h"
 	#include "input.h"
-	#include "debug.h"
+	#include "DEBUG.H"
 	#include "Isometric Utils.h"
 
 	#include "editscreen.h"
@@ -15,7 +15,7 @@
 	#include "Cursor Modes.h"
 	#include "Exit Grids.h"
 	//dnl ch86 110214
-	#include "keys.h"
+	#include "Keys.h"
 	#include "EditorItems.h"
 	#include "EditorMapInfo.h"
 

Editor/Editor Undo.h

@@ -1,4 +1,4 @@
-#include "BuildDefines.h"
+#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef __EDITOR_UNDO_H

Editor/EditorBuildings.cpp

@@ -18,7 +18,7 @@
 	#include "Editor Modes.h"
 	#include "Smoothing Utils.h"
 	#include "Text Input.h"
-	#include "keys.h"
+	#include "Keys.h"
 	#include "environment.h"
 	#include "selectwin.h"
 	#include "Simple Render Utils.h"

Editor/EditorBuildings.h

@@ -1,4 +1,4 @@
-#include "BuildDefines.h"
+#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef __EDITORBUILDINGS_H

Editor/EditorDefines.h

@@ -1,10 +1,10 @@
-#include "BuildDefines.h"
+#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef __EDITORDEFINES_H
 #define __EDITORDEFINES_H
 
-#include "Types.h"
+#include "types.h"
 #include "Button Defines.h"
 
 

Editor/EditorItems.cpp

@@ -9,34 +9,34 @@
 	#include "vobject.h"
 	#include "mousesystem.h"
 	#include "Button System.h"
-	#include "wcheck.h"
+	#include "WCheck.h"
 	#include "vsurface.h"
 	#include "input.h"
 	#include "sysutil.h"
-	#include "font.h"
+	#include "Font.h"
 	#include "Font Control.h"
 	#include "editscreen.h"
 	#include "selectwin.h"
 	#include "video.h"
 	#include "vobject_blitters.h"
-	#include "interface panels.h"
-	#include "interface items.h"
-	#include "text.h"
-	#include "utilities.h"
+	#include "Interface Panels.h"
+	#include "Interface Items.h"
+	#include "Text.h"
+	#include "Utilities.h"
 	#include "Action Items.h"
 	#include "World Items.h"
 	#include "EditorDefines.h"
 	#include "EditorItems.h"
 	#include "EditorMercs.h"
-	#include "weapons.h"
+	#include "Weapons.h"
 	#include "Editor Taskbar Utils.h"
-	#include "wordwrap.h"
+	#include "WordWrap.h"
 	#include "Item Statistics.h"
 	#include "Simple Render Utils.h"
 	#include "worldman.h"
 	#include "random.h"
-	#include "Pits.h"
-	#include "keys.h"
+	#include "pits.h"
+	#include "Keys.h"
 	#include "InterfaceItemImages.h"
 	#include "Editor Undo.h"//dnl ch86 220214
 

Editor/EditorItems.h

@@ -1,4 +1,4 @@
-#include "BuildDefines.h"
+#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef __EDITORITEMS_H

Editor/EditorMapInfo.cpp

@@ -9,23 +9,23 @@
 	#include "vobject.h"
 	#include "mousesystem.h"
 	#include "Button System.h"
-	#include "wcheck.h"
+	#include "WCheck.h"
 	#include "vsurface.h"
 	#include "line.h"
 	#include "input.h"
 	#include "sysutil.h"
-	#include "font.h"
+	#include "Font.h"
 	#include "Font Control.h"
 	#include "editscreen.h"
 	#include "selectwin.h"
 	#include "video.h"
 	#include "vobject_blitters.h"
-	#include "interface panels.h"
-	#include "interface items.h"
-	#include "utilities.h"
+	#include "Interface Panels.h"
+	#include "Interface Items.h"
+	#include "Utilities.h"
 	#include "World Items.h"
 	#include "worldman.h"
-	#include "overhead.h"	//GetSoldier
+	#include "Overhead.h"	//GetSoldier
 	#include "renderworld.h"
 	#include "Animation Data.h"
 	#include "Animation Control.h"
@@ -37,11 +37,11 @@
 	#include "Soldier Init List.h"
 	#include "strategicmap.h"
 	#include "Soldier Add.h"
-	#include "Soldier Profile Type.h"
+	#include "soldier profile type.h"
 	#include "Soldier Profile.h"
 	#include "Text Input.h"
-	#include "Random.h"
-	#include "wordwrap.h"
+	#include "random.h"
+	#include "WordWrap.h"
 	#include "EditorItems.h"
 	#include "Editor Taskbar Utils.h"
 	#include "Exit Grids.h"

Editor/EditorMapInfo.h

@@ -1,4 +1,4 @@
-#include "BuildDefines.h"
+#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef __EDITORMAPINFO_H

Editor/EditorMercs.cpp

@@ -9,24 +9,24 @@
 	#include "vobject.h"
 	#include "mousesystem.h"
 	#include "Button System.h"
-	#include "wcheck.h"
+	#include "WCheck.h"
 	#include "vsurface.h"
 	#include "line.h"
 	#include "input.h"
 	#include "sysutil.h"
-	#include "font.h"
+	#include "Font.h"
 	#include "Font Control.h"
 	#include "editscreen.h"
 	#include "selectwin.h"
 	#include "video.h"
 	#include "vobject_blitters.h"
-	#include "interface panels.h"
-	#include "interface items.h"
-	#include "text.h"
-	#include "utilities.h"
+	#include "Interface Panels.h"
+	#include "Interface Items.h"
+	#include "Text.h"
+	#include "Utilities.h"
 	#include "World Items.h"
 	#include "worldman.h"
-	#include "overhead.h"	//GetSoldier
+	#include "Overhead.h"	//GetSoldier
 	#include "renderworld.h"
 	#include "Animation Data.h"
 	#include "Animation Control.h"
@@ -39,11 +39,11 @@
 	#include "Soldier Init List.h"
 	#include "strategicmap.h"
 	#include "Soldier Add.h"
-	#include "Soldier Profile Type.h"
+	#include "soldier profile type.h"
 	#include "Soldier Profile.h"
 	#include "Text Input.h"
-	#include "Random.h"
-	#include "wordwrap.h"
+	#include "random.h"
+	#include "WordWrap.h"
 	#include "EditorItems.h"
 	#include "Editor Taskbar Utils.h"
 	#include "Exit Grids.h"

Editor/EditorMercs.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "BuildDefines.h"
+#include "builddefines.h"
 
 //-----------------------------------------------
 //

Editor/EditorTerrain.cpp

@@ -9,18 +9,18 @@
 	#include "vobject.h"
 	#include "mousesystem.h"
 	#include "Button System.h"
-	#include "wcheck.h"
+	#include "WCheck.h"
 	#include "vsurface.h"
 	#include "input.h"
 	#include "sysutil.h"
-	#include "font.h"
+	#include "Font.h"
 	#include "Font Control.h"
 	#include "editscreen.h"
 	#include "selectwin.h"
 	#include "video.h"
 	#include "vobject_blitters.h"
-	#include "interface panels.h"
-	#include "utilities.h"
+	#include "Interface Panels.h"
+	#include "Utilities.h"
 	#include "World Items.h"
 	#include "EditorDefines.h"
 	#include "EditorTerrain.h"

Editor/EditorTerrain.h

@@ -1,4 +1,4 @@
-#include "BuildDefines.h"
+#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef __EDITORTERRAIN_H

Editor/Item Statistics.cpp

@@ -7,7 +7,7 @@
 	#include "types.h"
 	#include "mousesystem.h"
 	#include "Button System.h"
-	#include "font control.h"
+	#include "Font Control.h"
 	#include "EditorDefines.h"
 	#include "Editor Taskbar Utils.h"
 	#include "EditorMercs.h"
@@ -20,10 +20,10 @@
 	#include "Weapons.h"
 	#include "Items.h"
 	#include "editscreen.h"
-	#include "Random.h"
+	#include "random.h"
 	#include "Handle Items.h"
 	#include "World Items.h"
-	#include "PopupMenu.h"
+	#include "popupmenu.h"
 	#include "pits.h"
 	#include "Text.h"
 

Editor/Item Statistics.h

@@ -1,4 +1,4 @@
-#include "BuildDefines.h"
+#include "builddefines.h"
 
 #ifndef __ITEM_STATISTICS_H
 #define __ITEM_STATISTICS_H

Editor/LoadScreen.cpp

@@ -5,8 +5,8 @@
 	#include <stdio.h>
 	#include "Font Control.h" 
 	#include "renderworld.h"
-	#include "render dirty.h"
-	#include "loadscreen.h"
+	#include "Render Dirty.h"
+	#include "LoadScreen.h"
 	#include "selectwin.h"
 	#include "EditorDefines.h"
 	#include "messagebox.h"

Editor/LoadScreen.h

@@ -1,5 +1,5 @@
-#include "BuildDefines.h"
-#include "Fileman.h"
+#include "builddefines.h"
+#include "FileMan.h"
 
 #define FILENAME_BUFLEN (30 + 4 + 1)//dnl ch39 190909 +4 is for ".dat", +1 is for '\0' //dnl ch81 021213
 

Editor/Road Smoothing.cpp

@@ -4,7 +4,7 @@
 
 	#include "types.h"
 	#include "Road Smoothing.h"
-	#include "tiledat.h"
+	#include "TileDat.h"
 	#include "worlddef.h"
 	#include "worldman.h"
 	#include "Editor Undo.h"

Editor/Road Smoothing.h

@@ -1,4 +1,4 @@
-#include "BuildDefines.h"
+#include "builddefines.h"
 
 #ifdef JA2EDITOR
 

Editor/Sector Summary.cpp

@@ -15,22 +15,22 @@
 	#include "line.h"
 	#include "input.h"
 	#include "vobject_blitters.h"
-	#include "loadscreen.h"
+	#include "LoadScreen.h"
 	#include "Text Input.h"
 	#include "mousesystem.h"
 	#include "strategicmap.h"
-	#include "Fileman.h"
+	#include "FileMan.h"
 	#include "Exit Grids.h"
 	#include "Map Information.h"
 	#include "Summary Info.h"
 	#include "Animated ProgressBar.h"
 	#include "worlddef.h"
-	#include "worlddat.h"
+	#include "WorldDat.h"
 	#include "EditorDefines.h"
 	#include "editscreen.h"
 	#include "english.h"
 	#include "World Items.h"
-	#include "text.h"
+	#include "Text.h"
 	#include "Soldier Create.h"
 	#include "GameVersion.h"
 	#include "Campaign Types.h"

Editor/Sector Summary.h

@@ -1,4 +1,4 @@
-#include "BuildDefines.h"
+#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef __SECTOR_SUMMARY_H

Editor/SmartMethod.h

@@ -1,4 +1,4 @@
-#include "BuildDefines.h"
+#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef __SMARTMETHOD_H

Editor/Smoothing Utils.h

@@ -1,4 +1,4 @@
-#include "BuildDefines.h"
+#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef __SMOOTHING_UTILS_H

Editor/Summary Info.h

@@ -1,10 +1,10 @@
-#include "BuildDefines.h"
+#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef __SUMMARY_INFO_H
 #define __SUMMARY_INFO_H
 
-#include "Types.h"
+#include "types.h"
 
 //dnl ch28
 #define GLOBAL_SUMMARY_VERSION	15

Editor/edit_sys.h

@@ -1,4 +1,4 @@
-#include "BuildDefines.h"
+#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef __EDIT_SYS_H

Editor/editscreen.cpp

@@ -12,22 +12,22 @@
 	#include "edit_sys.h"
 	#include "screenids.h"
 	#include "editscreen.h"
-	#include "sys globals.h"
+	#include "Sys Globals.h"
 	#include "SmartMethod.h"
 	#include "selectwin.h"
 	#include "Interface.h"
 	#include "lighting.h"
 	#include "Interactive Tiles.h"
-	#include "overhead types.h"
+	#include "Overhead Types.h"
 	#include "Overhead.h"
 	#include "Handle UI.h"
 	#include "Event Pump.h"
 	#include "world items.h"
-	#include "loadscreen.h"
-	#include "render dirty.h"
-	#include "isometric utils.h"
+	#include "LoadScreen.h"
+	#include "Render Dirty.h"
+	#include "Isometric Utils.h"
 	#include "message.h"
-	#include "render fun.h"
+	#include "Render Fun.h"
 	#include "popupmenu.h"
 	#include "overhead map.h"
 	#include "EditorDefines.h"
@@ -39,7 +39,7 @@
 	#include "newsmooth.h"
 	#include "Smoothing Utils.h"
 	#include "messagebox.h"
-	#include "messageboxscreen.h"
+	#include "MessageBoxScreen.h"
 	#include "Soldier Create.h"
 	#include "Soldier Init List.h"
 	#include "Text Input.h"
@@ -59,7 +59,7 @@
 	#include "line.h"
 	#include "english.h"
 	#include "random.h"
-	#include "scheduling.h"
+	#include "Scheduling.h"
 	#include "Road Smoothing.h"
 	#include "strategicmap.h"
 	#include "message.h"
@@ -70,7 +70,7 @@
 	#include "GameSettings.h"
 	#include "Summary Info.h"
 	#include "connect.h"//dnl
-	#include "cursors.h"//dnl ch2 210909
+	#include "Cursors.h"//dnl ch2 210909
 	#include "Cursor Control.h"//dnl ch2 210909
 	#include "maputility.h"//dnl ch49 061009
 	#include "Text.h"

Editor/editscreen.h

@@ -1,4 +1,4 @@
-#include "BuildDefines.h"
+#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef EDITSCREEN_H

Editor/messagebox.cpp

@@ -4,7 +4,7 @@
 
 	#include "vobject.h"
 	#include "video.h"
-	#include "font.h"
+	#include "Font.h"
 	#include "Font Control.h"
 	#include "messagebox.h"
 	#include "input.h"

Editor/messagebox.h

@@ -1,4 +1,4 @@
-#include "BuildDefines.h"
+#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef __MESSAGEBOX_H

Editor/newsmooth.cpp

@@ -14,7 +14,7 @@
 	#include "Editor Undo.h"
 	#include "Structure Internals.h"
 	#include "environment.h"
-	#include "Random.h"
+	#include "random.h"
 	#include "Render Fun.h"
 
 

Editor/newsmooth.h

@@ -1,4 +1,4 @@
-#include "BuildDefines.h"
+#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef __NEWSMOOTH_H

Editor/popupmenu.cpp

@@ -16,18 +16,18 @@
 
 	#include "tiledef.h"
 	#include "sysutil.h"
-	#include "font.h"
+	#include "Font.h"
 	#include "Font Control.h"
 	#include "line.h"
-	#include "worlddat.h"
+	#include "WorldDat.h"
 	#include "selectwin.h"
 	#include "popupmenu.h"
 	#include "EditorDefines.h"
-	#include "render dirty.h"
-	#include "debug.h"
+	#include "Render Dirty.h"
+	#include "DEBUG.H"
 	#include "mousesystem.h"
-	#include "cursors.h"
-	#include "overhead types.h"
+	#include "Cursors.h"
+	#include "Overhead Types.h"
 	#include "EditorMercs.h"
 	#include "Scheduling.h"
 	#include "english.h"

Editor/popupmenu.h

@@ -1,4 +1,4 @@
-#include "BuildDefines.h"
+#include "builddefines.h"
 
 #ifdef JA2EDITOR
 //popupmenu.h

Editor/selectwin.cpp

@@ -6,7 +6,7 @@
 
 	#include "tiledef.h"
 	#include "vsurface.h"
-	#include "worlddat.h"
+	#include "WorldDat.h"
 	#include "random.h"
 	#include "sysutil.h"
 	#include "Font Control.h"

Editor/selectwin.h

@@ -1,10 +1,10 @@
-#include "BuildDefines.h"
+#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef _SELECTION_WIN_H_
 #define _SELECTION_WIN_H_
 
-#include "Types.h"
+#include "types.h"
 #include "vobject.h"
 
 #include "mousesystem.h"

Editor/smooth.cpp

@@ -5,15 +5,15 @@
 	#include "stdlib.h"
 	#include "FileMan.h"
 	#include "time.h"
-	#include "debug.h"
+	#include "DEBUG.H"
 	#include "tiledef.h"
 	#include "worlddef.h"
 	#include "worldman.h"
 	#include "smooth.h"
 	#include "editscreen.h"
 	#include "selectwin.h"
-	#include "isometric utils.h"
-	#include "structure wrap.h"
+	#include "Isometric Utils.h"
+	#include "Structure Wrap.h"
 	#include "Exit Grids.h"
 	#include "Editor Undo.h"
 

Editor/smooth.h

@@ -1,4 +1,4 @@
-#include "BuildDefines.h"
+#include "builddefines.h"
 
 #ifdef JA2EDITOR
 #ifndef __SMOOTH_H

Ja2/Credits.cpp

@@ -1,24 +1,24 @@
-	#include "Types.h"
+	#include "types.h"
 	#include "Credits.h"
 	#include "vsurface.h"
 	#include "mousesystem.h"
 	#include "Text.h"
-	#include "wordwrap.h"
-	#include "Video.h"
-	#include "render dirty.h"
+	#include "WordWrap.h"
+	#include "video.h"
+	#include "Render Dirty.h"
 	#include "local.h"
-	#include "utilities.h"
+	#include "Utilities.h"
 	#include "WCheck.h"
 	#include "screenids.h"
 	#include "Font Control.h"
-	#include "cursors.h"
-	#include "font.h"
-	#include "wordwrap.h"
+	#include "Cursors.h"
+	#include "Font.h"
+	#include "WordWrap.h"
 	#include "sysutil.h"
-	#include "Input.h"
+	#include "input.h"
 	#include "english.h"
-	#include "encrypted file.h"
-	#include "Random.h"
+	#include "Encrypted File.h"
+	#include "random.h"
 
 //externals
 extern HVSURFACE ghFrameBuffer;

Ja2/Fade Screen.cpp

@@ -1,12 +1,12 @@
 	#include "sgp.h"
 	#include "screenids.h"
 	#include "Timer Control.h"
-	#include "sys globals.h"
-	#include "fade screen.h"
+	#include "Sys Globals.h"
+	#include "Fade Screen.h"
 	#include "sysutil.h"
 	#include "vobject_blitters.h"
-	#include "cursor control.h"
-	#include "music control.h"
+	#include "Cursor Control.h"
+	#include "Music Control.h"
 	#include "Render Dirty.h"
 	#include "gameloop.h"
 

Ja2/FeaturesScreen.cpp

@@ -1,6 +1,6 @@
-#include	"Types.h"
+#include	"types.h"
 #include	"FeaturesScreen.h"
-#include	"Video.h"
+#include	"video.h"
 #include	"Font Control.h"
 #include	"Game Clock.h"
 #include	"Text Input.h"
@@ -10,29 +10,29 @@
 #include	"WordWrap.h"
 #include	"WCheck.h"
 #include	"Utilities.h"
-#include	"Debug.h"
+#include	"DEBUG.H"
 #include	"Sound Control.h"
 #include	"Ambient Control.h"
-#include	"Worlddat.h"
-#include	"Worlddef.h"
+#include	"WorldDat.h"
+#include	"worlddef.h"
 #include	"GameSettings.h"
 #include	"Game Init.h"
-#include	"English.h"
+#include	"english.h"
 #include	"Overhead.h"
-#include	"Gap.h"
+#include	"GAP.H"
 #include	"Cursors.h"
-#include	"SysUtil.h"
+#include	"sysutil.h"
 #include	"Exit Grids.h"
 #include	"Text.h"
 #include	"Interface Control.h"
-#include	"Message.h"
+#include	"message.h"
 #include	"Multi Language Graphic Utils.h"
 #include	"Map Information.h"
 #include	"Sys Globals.h"
 #include	"insurance.h"
 
 #include		"connect.h"
-#include		"WorldMan.h"
+#include		"worldman.h"
 #include		"Init.h"
 #include		"Game Events.h"
 

Ja2/GameInitOptionsScreen.cpp

@@ -1,19 +1,19 @@
-	#include "Types.h"
+	#include "types.h"
 	#include "GameInitOptionsScreen.h"
 	#include "GameSettings.h"
 	#include "Utilities.h"
-	#include "wCheck.h"
+	#include "WCheck.h"
 	#include "Font Control.h"
 	#include "WordWrap.h"
 	#include "Render Dirty.h"
-	#include "Input.h"
+	#include "input.h"
 	#include "Options Screen.h"
-	#include "English.h"
-	#include "Sysutil.h"
+	#include "english.h"
+	#include "sysutil.h"
 	#include "Fade Screen.h"
 	#include "Cursor Control.h"
 	#include "Music Control.h"
-	#include "cursors.h"
+	#include "Cursors.h"
 	#include "Intro.h"
 	#include "Text.h"
 	#include "_Ja25EnglishText.h"
@@ -21,7 +21,7 @@
 
 #include "gameloop.h"
 #include "connect.h"
-#include "saveloadscreen.h"
+#include "SaveLoadScreen.h"
 
 #ifdef JA2UB
 	#include "ub_config.h"

Ja2/GameSettings.cpp

@@ -1,7 +1,7 @@
-	#include	"Types.h"
+	#include	"types.h"
 	#include	"GameSettings.h"
 	#include	"FileMan.h"
-	#include	"String.h"
+	#include	"string.h"
 	#include	"Sound Control.h"
 	#include	"SaveLoadScreen.h"
 	#include	"Music Control.h"
@@ -9,19 +9,19 @@
 	#include	"Overhead.h"
 	#include	"GameVersion.h"
 	#include	"LibraryDataBase.h"
-	#include	"Debug.h"
+	#include	"DEBUG.H"
 	#include "HelpScreen.h"
 	#include "INIReader.h"
 	#include "Shade Table Util.h"
 	#include "soldier profile type.h"
-	#include "Random.h"
+	#include "random.h"
 	#include "SaveLoadGame.h"
 	#include "sgp.h"
 	#include "screenids.h"
 	#include "Font Control.h"
 	#include "message.h"
 	#include "Campaign.h"
-	#include "meanwhile.h"
+	#include "Meanwhile.h"
 	#include "strategicmap.h"
 	#include "Queen Command.h"
 	#include "Game Clock.h"

Ja2/GameSettings.h

@@ -1,7 +1,7 @@
 #ifndef _GAME_SETTINGS__H_
 #define _GAME_SETTINGS__H_
 
-#include "Types.h"
+#include "types.h"
 #include "Strategic Status.h"
 #include "Morale.h"
 #include "GameInitOptionsScreen.h"

Ja2/GameVersion.cpp

@@ -1,4 +1,4 @@
-	#include "Types.h"
+	#include "types.h"
 	#include "GameVersion.h"
 
 //

Ja2/HelpScreen.cpp

@@ -1,19 +1,19 @@
 	#include "sgp.h"
 	#include "sysutil.h"
 	#include "vobject_blitters.h"
-	#include "wcheck.h"
-	#include "cursors.h"
-	#include "font control.h"
-	#include "cursor control.h"
-	#include "render dirty.h"
+	#include "WCheck.h"
+	#include "Cursors.h"
+	#include "Font Control.h"
+	#include "Cursor Control.h"
+	#include "Render Dirty.h"
 	#include	"Text.h"
 	#include	"Utilities.h"
 	#include	"WordWrap.h"
 	#include "Font Control.h"
-	#include "text.h"
+	#include "Text.h"
 	#include "HelpScreen.h"
 	#include "HelpScreenText.h"
-	#include "Line.h"
+	#include "line.h"
 	#include "Game Clock.h"
 	#include "GameSettings.h"
 	#include "laptop.h"

Ja2/Init.cpp

@@ -1,7 +1,7 @@
 	#include "builddefines.h"
 	#include <stdio.h>
 	#include "sgp.h"
-	#include "Gameloop.h"
+	#include "gameloop.h"
 	#include "Screens.h"
 	#include "INIReader.h"
 	#include "vobject_blitters.h"
@@ -10,7 +10,7 @@
 	#include "sysutil.h"
 	#include "worlddef.h"
 	#include "Animation Data.h"
-	#include "overhead.h"
+	#include "Overhead.h"
 	#include "Font Control.h"
 	#include "Button System.h"
 	#include "Timer Control.h"
@@ -21,18 +21,18 @@
 	#include "Event Pump.h"
 	#include "lighting.h"
 	#include "Cursor Control.h"
-	#include "music control.h"
+	#include "Music Control.h"
 	#include "video.h"
 	#include "mapscreen.h"
-	#include "interface items.h"
-	#include "Maputility.h"
+	#include "Interface Items.h"
+	#include "maputility.h"
 	#include "strategic.h"
-	#include "dialogue control.h"
+	#include "Dialogue Control.h"
 	#include "Text.h"
 	#include "laptop.h"
 	#include "NPC.h"
 	#include "MercTextBox.h"
-	#include "tile cache.h"
+	#include "Tile Cache.h"
 	#include "strategicmap.h"
 	#include "Map Information.h"
 	#include "Shade Table Util.h"
@@ -44,7 +44,7 @@
 	#include "jascreens.h"
 	#include "XML.h"
 	#include "SaveLoadGame.h"
-	#include "weapons.h"
+	#include "Weapons.h"
 	#include "Strategic Movement.h"
 	#include "Vehicles.h"
 	#include "Multilingual Text Code Generator.h"

Ja2/Intro.cpp

@@ -1,14 +1,14 @@
 	#include "sgp.h"
 	#include "sysutil.h"
 	#include "vobject_blitters.h"
-	#include "font control.h"
-	#include "cursor control.h"
-	#include "render dirty.h"
+	#include "Font Control.h"
+	#include "Cursor Control.h"
+	#include "Render Dirty.h"
 	#include	"Text.h"
 	#include	"Utilities.h"
 	#include	"WordWrap.h"
-	#include "text.h"
-	#include "Line.h"
+	#include "Text.h"
+	#include "line.h"
 	#include "Intro.h"
 	#include "Cinematics.h"
 	#include "Cinematics Bink.h"

Ja2/JA2 Splash.cpp

@@ -1,7 +1,7 @@
-#include "Types.h"
+#include "types.h"
 #include "vsurface.h"
 #include "mainmenuscreen.h"
-#include "Video.h"
+#include "video.h"
 #include "Timer Control.h"
 #include "Multi Language Graphic Utils.h"
 #include <stdio.h>

Ja2/Ja25Update.cpp

@@ -4,7 +4,7 @@
 #include <string.h>
 #include "Render Fun.h"
 #include "stdlib.h"
-#include "debug.h"
+#include "DEBUG.H"
 #include "MemMan.h"
 #include "Overhead Types.h"
 //#include "Soldier Control.h"
@@ -12,21 +12,21 @@
 #include "Animation Data.h"
 #include "Animation Control.h"
 #include <math.h>
-#include "pathai.h"
-#include "Random.h"
+#include "PATHAI.H"
+#include "random.h"
 #include "Isometric Utils.h"
 #include "renderworld.h"
 #include "video.h"
-#include "weapons.h"
+#include "Weapons.h"
 #include "vobject_blitters.h"
 #include "Handle UI.h"
-#include "Event pump.h"
+#include "Event Pump.h"
 #include "ai.h"
-#include "interface.h"
+#include "Interface.h"
 #include "lighting.h"
 #include "faces.h"
 #include "Soldier Profile.h"
-#include "soldier macros.h"
+#include "Soldier macros.h"
 #include "english.h"
 #include "Squads.h"
 
@@ -34,33 +34,33 @@
 #include "Networking.h"
 #include "NetworkEvent.h"
 #endif
-#include "items.h"
-#include "Soundman.h"
-#include "utilities.h"
-#include "Strategic.h"
+#include "Items.h"
+#include "soundman.h"
+#include "Utilities.h"
+#include "strategic.h"
 #include "soldier tile.h"
 #include "Smell.h"
 #include "Keys.h"
-#include "dialogue control.h"
-#include "soldier functions.h"
+#include "Dialogue Control.h"
+#include "Soldier Functions.h"
 #include "Exit Grids.h"
 #include "Quests.h"
 #include "message.h"
 #include "SkillCheck.h"
-#include "interface dialogue.h"
+#include "interface Dialogue.h"
 #include	"GameSettings.h"
 #include "ShopKeeper Interface.h"
-#include "vehicles.h"
+#include "Vehicles.h"
 #include "strategicmap.h"
-#include "morale.h"
-#include "drugs and alcohol.h"
+#include "Morale.h"
+#include "Drugs And Alcohol.h"
 #include "SkillCheck.h"
 #include "Map Information.h"
 #include "Buildings.h"
 #include "Text.h"
 #include "Campaign Types.h"
 #include "Strategic Status.h"
-#include "civ quotes.h"
+#include "Civ Quotes.h"
 #include "Debug Control.h"
 
 #ifdef JA2UB

Ja2/Ja25Update.h

@@ -1,7 +1,7 @@
 #ifndef JA25UPDATE__C_
 #define JA25UPDATE__C_
 
-#include "Types.h"
+#include "types.h"
 
 #ifdef JA2UB
 

Ja2/Loading Screen.cpp

@@ -4,12 +4,12 @@
 	#include "Campaign Types.h"
 	#include "Game Clock.h"
 	#include "GameSettings.h"
-	#include "Random.h"
-	#include "Debug.h"
+	#include "random.h"
+	#include "DEBUG.H"
 	#include "local.h"
 	#include "Font Control.h"
-	#include "font.h"
-	#include "render dirty.h"
+	#include "Font.h"
+	#include "Render Dirty.h"
 #include "Strategic Movement.h"
 #include "UndergroundInit.h"
 #include <string>

Ja2/MPChatScreen.cpp

@@ -1,26 +1,26 @@
 	#include "sgp.h"
 	#include "screenids.h"
 	#include "Timer Control.h"
-	#include "fade screen.h"
+	#include "Fade Screen.h"
 	#include "sysutil.h"
 	#include "vobject_blitters.h"
 	#include "MercTextBox.h"
-	#include "cursors.h"
-	#include "font control.h"
+	#include "Cursors.h"
+	#include "Font Control.h"
 	#include "Map Screen Interface.h"
 	#include "renderworld.h"
 	#include "gameloop.h"
 	#include "english.h"
 	#include "GameSettings.h"
-	#include "cursor control.h"
+	#include "Cursor Control.h"
 	#include "laptop.h"
-	#include "text.h"
+	#include "Text.h"
 	#include "Text Input.h"
 	#include "overhead map.h"
 	#include "MPChatScreen.h"
 	#include "WordWrap.h"
 #include "message.h"
-#include "utilities.h"
+#include "Utilities.h"
 #include "connect.h"
 
 #define		CHATBOX_WIDTH							310 // 350 is the max size, the PrepareMercPopupBox will add the X_MARGIN to both sides

Ja2/MPConnectScreen.cpp

@@ -1,19 +1,19 @@
-	#include "Types.h"
+	#include "types.h"
 	#include "MPConnectScreen.h"
 	#include "GameSettings.h"
 	#include "Utilities.h"
-	#include "wCheck.h"
+	#include "WCheck.h"
 	#include "Font Control.h"
 	#include "WordWrap.h"
 	#include "Render Dirty.h"
-	#include "Input.h"
+	#include "input.h"
 	#include "Options Screen.h"
-	#include "English.h"
-	#include "Sysutil.h"
+	#include "english.h"
+	#include "sysutil.h"
 	#include "Fade Screen.h"
 	#include "Cursor Control.h"
 	#include "Music Control.h"
-	#include "cursors.h"
+	#include "Cursors.h"
 	#include "Text.h"
 	#include "Text Input.h"
 	#include "Soldier Profile.h"
@@ -25,8 +25,8 @@
 #include "connect.h"
 #include "network.h" // for client name
 #include "message.h"
-#include "init.h"
-#include "xml.h"
+#include "Init.h"
+#include "XML.h"
 
 
 ////////////////////////////////////////////

Ja2/MPHostScreen.cpp

@@ -1,18 +1,18 @@
-	#include "Types.h"
+	#include "types.h"
 	#include "MPHostScreen.h"
 	#include "GameSettings.h"
 	#include "Utilities.h"
-	#include "wCheck.h"
+	#include "WCheck.h"
 	#include "Font Control.h"
 	#include "WordWrap.h"
 	#include "Render Dirty.h"
-	#include "Input.h"
+	#include "input.h"
 	#include "Options Screen.h"
-	#include "English.h"
-	#include "Sysutil.h"
+	#include "english.h"
+	#include "sysutil.h"
 	#include "Fade Screen.h"
 	#include "Cursor Control.h"
-	#include "cursors.h"
+	#include "Cursors.h"
 	#include "Intro.h"
 	#include "Text.h"
 	#include "Text Input.h"
@@ -22,7 +22,7 @@
 #include "gameloop.h"
 #include "connect.h"
 #include "network.h"
-#include "saveloadscreen.h"
+#include "SaveLoadScreen.h"
 
 #include "GameInitOptionsScreen.h"
 
@@ -31,9 +31,9 @@
 #include <vfs/Tools/vfs_property_container.h>
 #include <vfs/Core/vfs_os_functions.h>
 #include "MPJoinScreen.h"
-#include "MainMenuScreen.h"
+#include "mainmenuscreen.h"
 #include "Init.h"
-#include "xml.h"
+#include "XML.h"
 
 ////////////////////////////////////////////
 //

Ja2/MPJoinScreen.cpp

@@ -1,18 +1,18 @@
-	#include "Types.h"
+	#include "types.h"
 	#include "MPJoinScreen.h"
 	#include "GameSettings.h"
 	#include "Utilities.h"
-	#include "wCheck.h"
+	#include "WCheck.h"
 	#include "Font Control.h"
 	#include "WordWrap.h"
 	#include "Render Dirty.h"
-	#include "Input.h"
+	#include "input.h"
 	#include "Options Screen.h"
-	#include "English.h"
-	#include "Sysutil.h"
+	#include "english.h"
+	#include "sysutil.h"
 	#include "Fade Screen.h"
 	#include "Cursor Control.h"
-	#include "cursors.h"
+	#include "Cursors.h"
 	#include "Text.h"
 	#include "Text Input.h"
 	#include "Soldier Profile.h"
@@ -20,15 +20,15 @@
 #include "gameloop.h"
 #include "connect.h"
 #include "network.h" // for client name
-#include "saveloadscreen.h"
-#include "game init.h"
+#include "SaveLoadScreen.h"
+#include "Game Init.h"
 
 #include <vfs/Core/vfs.h>
 #include <vfs/Core/vfs_init.h>
 #include <vfs/Tools/vfs_property_container.h>
 #include <vfs/Core/vfs_os_functions.h>
 
-#include "Random.h"
+#include "random.h"
 
 ////////////////////////////////////////////
 //

Ja2/MPScoreScreen.cpp

@@ -1,19 +1,19 @@
-	#include "Types.h"
+	#include "types.h"
 	#include "MPScoreScreen.h"
 	#include "GameSettings.h"
 	#include "Utilities.h"
-	#include "wCheck.h"
+	#include "WCheck.h"
 	#include "Font Control.h"
 	#include "WordWrap.h"
 	#include "Render Dirty.h"
-	#include "Input.h"
+	#include "input.h"
 	#include "Options Screen.h"
-	#include "English.h"
-	#include "Sysutil.h"
+	#include "english.h"
+	#include "sysutil.h"
 	#include "Fade Screen.h"
 	#include "Cursor Control.h"
 	#include "Music Control.h"
-	#include "cursors.h"
+	#include "Cursors.h"
 	#include "Intro.h"
 	#include "Text.h"
 	#include "Text Input.h"

Ja2/MainMenuScreen.cpp

@@ -4,35 +4,35 @@
 	#include "sysutil.h"
 	#include "vobject_blitters.h"
 	#include "MercTextBox.h"
-	#include "cursors.h"
-	#include "font control.h"
+	#include "Cursors.h"
+	#include "Font Control.h"
 	#include "mainmenuscreen.h"
-	#include "cursor control.h"
-	#include "render dirty.h"
-	#include "music control.h"
+	#include "Cursor Control.h"
+	#include "Render Dirty.h"
+	#include "Music Control.h"
 	#include "GameSettings.h"
 	#include "SaveLoadScreen.h"
 	#include "SaveLoadGame.h"
 	#include "Options Screen.h"
-	#include	"English.h"
-	#include	"Gameloop.h"
+	#include	"english.h"
+	#include	"gameloop.h"
 	#include	"Game Init.h"
 	#include	"Utilities.h"
 	#include	"WordWrap.h"
 	#include "Font Control.h"
-	#include "text.h"
+	#include "Text.h"
 	#include "Multi Language Graphic Utils.h"
 	#include "Encrypted File.h"
-	#include "ja2 splash.h"
+	#include "JA2 Splash.h"
 	#include "GameVersion.h"
 
-#include "gamesettings.h"
+#include "GameSettings.h"
 #include "connect.h"
 #include "strategic.h"
-#include "strategic movement.h"
-#include "overhead.h"
-#include "init.h"
-#include "xml.h"
+#include "Strategic Movement.h"
+#include "Overhead.h"
+#include "Init.h"
+#include "XML.h"
 #include <vfs/Core/vfs.h>
 #include <vfs/Core/vfs_profile.h>
 

Ja2/MessageBoxScreen.cpp

@@ -1,21 +1,21 @@
 	#include "sgp.h"
 	#include "screenids.h"
-	#include "fade screen.h"
+	#include "Fade Screen.h"
 	#include "sysutil.h"
 	#include "vobject_blitters.h"
 	#include "MercTextBox.h"
-	#include "cursors.h"
-	#include "messageboxscreen.h"
-	#include "font control.h"
+	#include "Cursors.h"
+	#include "MessageBoxScreen.h"
+	#include "Font Control.h"
 	#include "Map Screen Interface.h"
 	#include "renderworld.h"
 	#include "gameloop.h"
 	#include "english.h"
 	#include "GameSettings.h"
 	#include "Interface Control.h"
-	#include "cursor control.h"
+	#include "Cursor Control.h"
 	#include "laptop.h"
-	#include "text.h"
+	#include "Text.h"
 	#include "Text Input.h"
 	#include "overhead map.h"
 	#include "DropDown.h"		// added by Flugente

Ja2/Options Screen.cpp

@@ -1,6 +1,6 @@
-	#include	"Types.h"
+	#include	"types.h"
 	#include	"Options Screen.h"
-	#include	"Video.h"
+	#include	"video.h"
 	#include	"Font Control.h"
 	#include	"Game Clock.h"
 	#include	"Text Input.h"
@@ -11,24 +11,24 @@
 	#include	"WCheck.h"
 	#include	"Utilities.h"
 	#include	"Slider.h"
-	#include	"Debug.h"
+	#include	"DEBUG.H"
 	#include	"Music Control.h"
 	#include	"Sound Control.h"
 	#include	"soundman.h"
 	#include	"Ambient Control.h"
-	#include	"Worlddat.h"
-	#include	"Worlddef.h"
+	#include	"WorldDat.h"
+	#include	"worlddef.h"
 	#include	"GameSettings.h"
 	#include	"Game Init.h"
-	#include	"English.h"
+	#include	"english.h"
 	#include	"Overhead.h"
-	#include	"Gap.h"
+	#include	"GAP.H"
 	#include	"Cursors.h"
-	#include	"SysUtil.h"
+	#include	"sysutil.h"
 	#include	"Exit Grids.h"
 	#include	"Text.h"
 	#include	"Interface Control.h"
-	#include	"Message.h"
+	#include	"message.h"
 	#include "Multi Language Graphic Utils.h"
 	#include "Map Information.h"
 	#include "SmokeEffects.h"
@@ -36,7 +36,7 @@
 
 #include		"Cheats.h"
 #include		"connect.h"
-#include		"WorldMan.h"
+#include		"worldman.h"
 #include		"Init.h"
 #include		"Game Events.h"
 #include		"PostalService.h"

Ja2/SaveLoadGame.cpp

@@ -1,32 +1,32 @@
-	#include "Types.h"
+	#include "types.h"
 	#include "Soldier Profile.h"
 	#include "FileMan.h"
 	#include <string.h>
 	#include <stdio.h>
-	#include "Debug.h"
-	#include "OverHead.h"
+	#include "DEBUG.H"
+	#include "Overhead.h"
 	#include "Keys.h"
 	#include "finances.h"
-	#include "History.h"
+	#include "history.h"
 	#include "files.h"
-	#include "Laptop.h"
-	#include "iniReader.h"
-	#include "Email.h"
-	#include "Strategicmap.h"
+	#include "laptop.h"
+	#include "INIReader.h"
+	#include "email.h"
+	#include "strategicmap.h"
 	#include "Game Events.h"
 	#include "Game Clock.h"
 	#include "Soldier Create.h"
-	#include "WorldDef.h"
+	#include "worlddef.h"
 	#include "LaptopSave.h"
 	#include "strategicmap.h"
 	#include "Queen Command.h"
 	#include "SaveLoadGame.h"
 	#include "Tactical Save.h"
 	#include "Squads.h"
-	#include "Environment.h"
-	#include "Lighting.h"
+	#include "environment.h"
+	#include "lighting.h"
 	#include "Strategic Movement.h"
-	#include "Strategic.h"
+	#include "strategic.h"
 	#include "Isometric Utils.h"
 	#include "Quests.h"
 	#include "opplist.h"
@@ -38,17 +38,17 @@
 	#include "GameSettings.h"
 	#include "Music Control.h"
 	#include "Options Screen.h"
-	#include "Ai.h"
-	#include "RenderWorld.h"
+	#include "ai.h"
+	#include "renderworld.h"
 	#include "SmokeEffects.h"
-	#include "Random.h"
+	#include "random.h"
 	#include "Map Screen Interface.h"
 	#include "Map Screen Interface Border.h"
 	#include "Map Screen Interface Bottom.h"
 
 	#include "Interface.h"
 	#include "Map Screen Helicopter.h"
-	#include "Environment.h"
+	#include "environment.h"
 	#include "Arms Dealer Init.h"
 	#include "Tactical Placement GUI.h"
 
@@ -57,43 +57,43 @@
 	#include "Vehicles.h"
 	#include "Merc Contract.h"
 	#include "Bullets.h"
-	#include "air raid.h"
+	#include "Air Raid.h"
 	#include "physics.h"
 	#include "Strategic Pathing.h"
 
 	#include "TeamTurns.h"
 
-	#include "explosion control.h"
+	#include "Explosion Control.h"
 	#include "Creature Spreading.h"
 	#include "Strategic Status.h"
-	#include "Prebattle Interface.h"
+	#include "PreBattle Interface.h"
 	#include "Boxing.h"
 	#include "Strategic AI.h"
 	#include "Map Screen Interface Map.h"
 
 	#include "Meanwhile.h"
-	#include "dialogue control.h"
-	#include "text.h"
-	#include	"Map Screen Interface.h"
-	#include	"lighteffects.h"
+	#include "Dialogue Control.h"
+	#include "Text.h"
+	#include "Map Screen Interface.h"
+	#include "LightEffects.h"
 	#include "HelpScreen.h"
 	#include "Animated ProgressBar.h"
-	#include "merctextbox.h"
-	#include "render dirty.h"
+	#include "MercTextBox.h"
+	#include "Render Dirty.h"
 	#include "Map Information.h"
 	#include "Interface Items.h"
 	#include "Civ Quotes.h"
 	#include "Scheduling.h"
 	#include "Animation Data.h"
 	#include "Game Init.h"
-	#include "cheats.h"
+	#include "Cheats.h"
 	#include "Strategic Event Handler.h"
-	#include "interface panels.h"
-	#include "interface dialogue.h"
+	#include "Interface Panels.h"
+	#include "interface Dialogue.h"
 	#include "Assignments.h"
 	#include "Interface Items.h"
-	#include "Shopkeeper Interface.h"
-	#include "postalservice.h"
+	#include "ShopKeeper Interface.h"
+	#include "PostalService.h"
 	// HEADROCK HAM B1: Additional Include for HAM
 	#include "MilitiaSquads.h"
 	// HEADROCK HAM 3.5: Another include for HAM
@@ -110,17 +110,17 @@
 	#include "Rebel Command.h"
 
 #include		"BobbyR.h"
-#include		"Imp Portraits.h"
+#include		"IMP Portraits.h"
 #include		"Loading Screen.h"
 #include		"Interface Utils.h"
 #include		"Squads.h"
 #include		"IMP Confirm.h"
 #include "Enemy Soldier Save.h"
 #include "BobbyRMailOrder.h"
-#include "Mercs.h"
+#include "mercs.h"
 #include "INIReader.h"
 #include "mercs.h"
-#include "soldier Profile.h"
+#include "Soldier Profile.h"
 #ifdef JA2UB
 #include "Ja25 Strategic Ai.h"
 #include "Ja25_Tactical.h"

Ja2/SaveLoadScreen.cpp

@@ -1,34 +1,34 @@
-	#include	"Types.h"
+	#include	"types.h"
 	#include	"SaveLoadScreen.h"
-	#include	"Video.h"
+	#include	"video.h"
 	#include	"Font Control.h"
 	#include	"Game Clock.h"
 	#include	"Render Dirty.h"
 	#include	"Text Input.h"
 	#include	"SaveLoadGame.h"
-	#include	"Stdio.h"
+	#include	"stdio.h"
 	#include	"WordWrap.h"
-	#include	"StrategicMap.h"
-	#include	"Finances.h"
+	#include	"strategicmap.h"
+	#include	"finances.h"
 	#include	"WCheck.h"
 	#include	"Utilities.h"
 	#include	"Cursors.h"
-	#include	"VObject.h"
+	#include	"vobject.h"
 	#include	"Merc Hiring.h"
 	#include	"LaptopSave.h"
 	#include	"Options Screen.h"
 	#include	"GameVersion.h"
-	#include	"SysUtil.h"
+	#include	"sysutil.h"
 	#include	"Tactical Save.h"
-	#include	"OverHead.h"
+	#include	"Overhead.h"
 	#include	"gamescreen.h"
 	#include	"GameSettings.h"
-	#include	"fade screen.h"
-	#include	"English.h"
-	#include	"Gameloop.h"
+	#include	"Fade Screen.h"
+	#include	"english.h"
+	#include	"gameloop.h"
 	#include	"Game Init.h"
 	#include	"Text.h"
-	#include	"Message.h"
+	#include	"message.h"
 	#include	"Map Screen Interface.h"
 	#include	"Multi Language Graphic Utils.h"
 	#include	"Campaign Types.h"

Ja2/Screens.h

@@ -1,8 +1,8 @@
 #ifndef __SCREEN_MANAGER
 #define __SCREEN_MANAGER
 
-#include "Types.h"
-#include "ScreenIds.h"
+#include "types.h"
+#include "screenids.h"
 
 // Each screen in the game comes with a Status flag (what was the last thing the screen was doing), an Initialization
 // function (which loads up the screen if necessary), a Handler function which is called while the screen is showing and

Ja2/TimeLogging.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "Types.h"
+#include "types.h"
 
 void TimingLogInitialize(const CHAR8* filename);
 void TimingLog(const CHAR8* logEvent, int n);

Ja2/aniviewscreen.cpp

@@ -9,9 +9,9 @@
 	#include "worlddef.h"
 	#include "renderworld.h"
 	#include "input.h"
-	#include "font.h"
+	#include "Font.h"
 	#include "screenids.h"
-	#include "overhead.h"
+	#include "Overhead.h"
 	#include "sysutil.h"
 	#include "Font Control.h"
 	#include "Animation Control.h"
@@ -23,8 +23,8 @@
 	#include <wchar.h>
 	#include <tchar.h>
 	#include "english.h"
-	#include "Fileman.h"
-	#include "messageboxscreen.h"
+	#include "FileMan.h"
+	#include "MessageBoxScreen.h"
 
 //forward declarations of common classes to eliminate includes
 class OBJECTTYPE;

Ja2/builddefines.h

@@ -77,6 +77,6 @@
 #define _CRT_NON_CONFORMING_SWPRINTFS
 #define _SCL_SECURE_NO_WARNINGS
 
-#include "Profiler.h"
+#include "profiler.h"
 
 #endif

Ja2/gameloop.cpp

@@ -1,17 +1,17 @@
 	#include <stdio.h>
 	#include <time.h>
 	#include "sgp.h"
-	#include "Gameloop.h"
+	#include "gameloop.h"
 	#include "Screens.h"
-	#include "cursors.h"
-	#include "init.h"
-	#include "music control.h"
-	#include "sys globals.h"
+	#include "Cursors.h"
+	#include "Init.h"
+	#include "Music Control.h"
+	#include "Sys Globals.h"
 	#include "laptop.h"
 	#include "mapscreen.h"
 	#include "Game Clock.h"
 	#include "Timer Control.h"
-	#include "overhead.h"
+	#include "Overhead.h"
 	#include "LibraryDataBase.h"
 	#include "Map Screen Interface.h"
 	#include "Tactical Save.h"
@@ -19,7 +19,7 @@
 	#include "GameSettings.h"
 	#include "mapscreen.h"
 	#include "Interface Control.h"
-	#include "text.h"
+	#include "Text.h"
 	#include "HelpScreen.h"
 	#include "PreBattle Interface.h"
 	#include "Tactical Placement GUI.h"//dnl ch45 071009

Ja2/gameloop.h

@@ -1,7 +1,7 @@
 #ifndef __GAMELOOP_
 #define __GAMELOOP_
 
-#include "Types.h"
+#include "types.h"
 
 // main game loop systems
 #define INIT_SYSTEM										0

Ja2/gamescreen.cpp

@@ -6,10 +6,10 @@
 	#include "vobject.h"
 	#include "worlddef.h"
 	#include "renderworld.h"
-	#include "font.h"
+	#include "Font.h"
 	#include "screenids.h"
-	#include "screens.h"
-	#include "overhead.h"
+	#include "Screens.h"
+	#include "Overhead.h"
 	#include "Isometric Utils.h"
 	#include "sysutil.h"
 	#include "input.h"
@@ -22,60 +22,60 @@
 	#include "Handle UI.h"
 	#include <wchar.h>
 	#include <tchar.h>
-	#include "cursors.h"
+	#include "Cursors.h"
 	#include "vobject_blitters.h"
 	#include "Button System.h"
 	#include "lighting.h"
 	#include "renderworld.h"
-	#include "sys globals.h"
+	#include "Sys Globals.h"
 	#include "environment.h"
-	#include "bullets.h"
+	#include "Bullets.h"
 	#include "Assignments.h"
 	#include "message.h"
 	#include <string.h>
 	#include "overhead map.h"
 	#include "Strategic Exit GUI.h"
-	#include "strategic movement.h"
+	#include "Strategic Movement.h"
 	#include "Tactical Placement GUI.h"
-	#include "Air raid.h"
+	#include "Air Raid.h"
 	#include "Game Clock.h"
-	#include "game init.h"
+	#include "Game Init.h"
 
 	//DEF: Test Code
 	#ifdef NETWORKED
 	#include "Networking.h"
 	#endif
-	#include "interface control.h"
-	#include "game clock.h"
+	#include "Interface Control.h"
+	#include "Game Clock.h"
 	#include "physics.h"
-	#include "fade screen.h"
-	#include "dialogue control.h"
-	#include "soldier macros.h"
+	#include "Fade Screen.h"
+	#include "Dialogue Control.h"
+	#include "Soldier macros.h"
 	#include "faces.h"
 	#include "strategicmap.h"
 	#include "gamescreen.h"
-	#include "interface.h"
-	#include "cursor control.h"
-	#include "strategic turns.h"
+	#include "Interface.h"
+	#include "Cursor Control.h"
+	#include "Strategic Turns.h"
 
 	#include "merc entering.h"
-	#include "soldier create.h"
+	#include "Soldier Create.h"
 	#include "Soldier Init List.h"
-	#include "interface panels.h"
+	#include "Interface Panels.h"
 	#include "Map Information.h"
 	#include "environment.h"
 	#include "Squads.h"
-	#include "interface dialogue.h"
-	#include "auto bandage.h"
-	#include "meanwhile.h"
-	#include "strategic ai.h"
+	#include "interface Dialogue.h"
+	#include "Auto Bandage.h"
+	#include "Meanwhile.h"
+	#include "Strategic AI.h"
 	#include "HelpScreen.h"
 	#include "PreBattle Interface.h"
 	#include "Sound Control.h"
 	#include "MessageBoxScreen.h"
 	#include "Text.h"
 	#include "GameSettings.h"
-	#include "Random.h"
+	#include "random.h"
 	#include "editscreen.h"
 	#include "Scheduling.h"
 	#include "Animated ProgressBar.h"

Ja2/gamescreen.h

@@ -2,7 +2,7 @@
 #define _GAMESCREEN_H
 
 
-#include "fade screen.h"
+#include "Fade Screen.h"
 
 #define		ARE_IN_FADE_IN( )		( gfFadeIn || gfFadeInitialized )
 

Ja2/jascreens.cpp

@@ -6,13 +6,13 @@
 	#include "himage.h"
 	#include "vobject.h"
 	#include "vobject_blitters.h"
-	#include "wcheck.h"
+	#include "WCheck.h"
 	#include "input.h"
-	#include "font.h"
+	#include "Font.h"
 	#include "timer.h"
 	#include "mousesystem.h"
 	#include "screenids.h"
-	#include "screens.h"
+	#include "Screens.h"
 	#include "Font Control.h"
 	#include "sysutil.h"
 	#include "tiledef.h"
@@ -22,30 +22,30 @@
 	#include <tchar.h>
 	#include "Timer Control.h"
 	#include "Sys Globals.h"
-	#include "interface.h"
-	#include "overhead.h"
-	#include "utilities.h"
-	#include "render dirty.h"
+	#include "Interface.h"
+	#include "Overhead.h"
+	#include "Utilities.h"
+	#include "Render Dirty.h"
 	#include "jascreens.h"
 	#include "gameloop.h"
 	#include "Event Pump.h"
-	#include "animation cache.h"
+	#include "Animation Cache.h"
 	#include "lighting.h"
 	#include "mainmenuscreen.h"
 	#include "Game Init.h"
-	#include "init.h"
-	#include "cursor control.h"
-	#include "utilities.h"
+	#include "Init.h"
+	#include "Cursor Control.h"
+	#include "Utilities.h"
 	#include "GameVersion.h"
-	#include "game clock.h"
+	#include "Game Clock.h"
 	#include "gamescreen.h"
 	#include "english.h"
-	#include "Random.h"
+	#include "random.h"
 	#include "WordWrap.h"
 	#include "Sound Control.h"
 	#include "WordWrap.h"
-	#include "text.h"
-	#include "IniReader.h"
+	#include "Text.h"
+	#include "INIReader.h"
 
 #include "sgp_logger.h"
 #include <language.hpp>

Ja2/jascreens.h

@@ -2,7 +2,7 @@
 #define __JASCREENS_H_
 
 #include "sgp.h"
-#include "ScreenIds.h"
+#include "screenids.h"
 #include "mousesystem.h"
 #include "Button System.h"
 #include <list>

Ja2/legion cfg.cpp

@@ -1,10 +1,10 @@
 //legion 2
-	#include "Types.h"
 	#include "types.h"
-	#include "Random.h"
+	#include "types.h"
+	#include "random.h"
 	#include "Campaign Types.h"
 	#include "Queen Command.h"
-	#include "overhead.h"
+	#include "Overhead.h"
 	#include "Strategic Movement.h"
 	#include "Strategic Status.h"
 	#include "GameSettings.h"
@@ -17,36 +17,36 @@
 	#include "laptop.h"
 	#include "worlddef.h"
 	#include "Soldier Control.h"
-	#include "overhead.h"
+	#include "Overhead.h"
 	#include "email.h"
-	#include "soldier profile.h"
+	#include "Soldier Profile.h"
 	#include "strategicmap.h"
-	#include "game init.h"
-	#include "animation data.h"
-	#include "soldier create.h"
+	#include "Game Init.h"
+	#include "Animation Data.h"
+	#include "Soldier Create.h"
 	#include "Soldier Init List.h"
 	#include "strategic.h"
 	#include "Squads.h"
 	#include "Strategic Town Loyalty.h"
 	#include "Strategic Mines.h"
 	#include "gameloop.h"
-	#include "Random.h"
+	#include "random.h"
 	#include "Map Screen Interface.h"
 	#include "Tactical Save.h"
 	#include "Campaign Types.h"
-	#include "Message.h"
+	#include "message.h"
 	#include "Game Event Hook.h"
 	#include "Strategic Movement.h"
 	#include "Quests.h"
 	#include "Strategic AI.h"
-	#include "dialogue control.h"
+	#include "Dialogue Control.h"
 	#include "GameSettings.h"
 	#include "INIReader.h"
 	#include "Soldier Profile.h"
 	#include "XML.h"
 	#include "Item Types.h"
 	#include "Items.h"
-	#include "text.h"
+	#include "Text.h"
 	#include "GameSettings.h"
 
 #ifdef JA2UB

Ja2/ub_config.cpp

@@ -1,9 +1,9 @@
-	#include "Types.h"
 	#include "types.h"
-	#include "Random.h"
+	#include "types.h"
+	#include "random.h"
 	#include "Campaign Types.h"
 	#include "Queen Command.h"
-	#include "overhead.h"
+	#include "Overhead.h"
 	#include "Strategic Movement.h"
 	#include "Strategic Status.h"
 	#include "GameSettings.h"
@@ -16,36 +16,36 @@
 	#include "laptop.h"
 	#include "worlddef.h"
 	#include "Soldier Control.h"
-	#include "overhead.h"
+	#include "Overhead.h"
 	#include "email.h"
-	#include "soldier profile.h"
+	#include "Soldier Profile.h"
 	#include "strategicmap.h"
-	#include "game init.h"
-	#include "animation data.h"
-	#include "soldier create.h"
+	#include "Game Init.h"
+	#include "Animation Data.h"
+	#include "Soldier Create.h"
 	#include "Soldier Init List.h"
 	#include "strategic.h"
 	#include "Squads.h"
 	#include "Strategic Town Loyalty.h"
 	#include "Strategic Mines.h"
 	#include "gameloop.h"
-	#include "Random.h"
+	#include "random.h"
 	#include "Map Screen Interface.h"
 	#include "Tactical Save.h"
 	#include "Campaign Types.h"
-	#include "Message.h"
+	#include "message.h"
 	#include "Game Event Hook.h"
 	#include "Strategic Movement.h"
 	#include "Quests.h"
 	#include "Strategic AI.h"
-	#include "dialogue control.h"
+	#include "Dialogue Control.h"
 	#include "GameSettings.h"
 	#include "INIReader.h"
 	#include "Soldier Profile.h"
 	#include "XML.h"
 	#include "Item Types.h"
 	#include "Items.h"
-	#include "text.h"
+	#include "Text.h"
 	#include "GameSettings.h"
 
 #ifdef JA2UB

Laptop/AimFacialIndex.cpp

@@ -4,11 +4,11 @@
 	#include "Utilities.h"
 	#include "WCheck.h"
 	#include "stdio.h"
-	#include "Aim.h"
+	#include "aim.h"
 	#include "Soldier Profile.h"
 	#include "email.h"
 	#include "Text.h"
-	#include "aimsort.h"
+	#include "AimSort.h"
 	#include "Assignments.h"
 	#include "GameSettings.h"
 	#include "english.h"

Laptop/AimMembers.cpp

@@ -1,30 +1,30 @@
 	#include "email.h"
 	#include "laptop.h"
 	#include "AimMembers.h"
-	#include "Aim.h"
+	#include "aim.h"
 	#include "Utilities.h"
 	#include "WCheck.h"
-	#include "Debug.h"
+	#include "DEBUG.H"
 	#include "stdio.h"
 	#include "sysutil.h"
 	#include "Soldier Profile.h"
 	#include "Soldier Control.h"
-	#include "InterFace Items.h"
-	#include "overhead.h"
+	#include "Interface Items.h"
+	#include "Overhead.h"
 	#include "WordWrap.h"
 	#include "finances.h"
 	#include "vsurface.h"
-	#include "VObject.h"
+	#include "vobject.h"
 	#include "Game Clock.h"
-	#include "overhead.h"
-	#include "Faces.h"
-	#include "dialogue control.h"
-	#include "text.h"
-	#include "History.h"
+	#include "Overhead.h"
+	#include "faces.h"
+	#include "Dialogue Control.h"
+	#include "Text.h"
+	#include "history.h"
 	#include "Game Event Hook.h"
 	#include "MercTextBox.h"
 	#include "Render Dirty.h"
-	#include "weapons.h"
+	#include "Weapons.h"
 	#include "Soldier Add.h"
 	#include "Merc Hiring.h"
 	#include "strategic.h"
@@ -32,7 +32,7 @@
 	#include "LaptopSave.h"
 	#include "english.h"
 	#include "GameSettings.h"
-	#include "Random.h"
+	#include "random.h"
 	#include "Strategic Status.h"
 	#include "Merc Contract.h"
 	#include "Strategic Merc Handler.h"
@@ -40,7 +40,7 @@
 	#include "Sound Control.h"
 	#include "Quests.h"
 	#include "strategicmap.h"
-	#include "Personnel.h"
+	#include "personnel.h"
 	#include "Encyclopedia_new.h"	//update encyclopedia item visibility when viewing that item
 
 #include "Strategic Town Loyalty.h"

Laptop/AimSort.cpp

@@ -1,6 +1,6 @@
 	#include "laptop.h"
 	#include "AimSort.h"
-	#include "Aim.h"
+	#include "aim.h"
 	#include "WCheck.h"
 	#include "Utilities.h"
 	#include "WordWrap.h"

Laptop/BobbyR.cpp

@@ -5,20 +5,20 @@
 	#include "WCheck.h"
 	#include "WordWrap.h"
 	#include "Cursors.h"
-	#include "interface items.h"
+	#include "Interface Items.h"
 	#include "Weapons.h"
 	#include "Store Inventory.h"
 	#include "Game Event Hook.h"
 	#include "Game Clock.h"
 	#include "LaptopSave.h"
-	#include "Random.h"
+	#include "random.h"
 	#include "Text.h"
 	#include "Multi Language Graphic Utils.h"
 //	#include "Utility.h"
-	#include "armsdealerinvinit.h"
+	#include "ArmsDealerInvInit.h"
 	#include "GameSettings.h"
 	#include "message.h"
-	#include "postalservice.h"
+	#include "PostalService.h"
 
 
 #ifdef JA2TESTVERSION

Laptop/BobbyRAmmo.cpp

@@ -6,7 +6,7 @@
 	#include "WCheck.h"
 	#include "WordWrap.h"
 	#include "Encrypted File.h"
-	#include "text.h"
+	#include "Text.h"
 
 UINT32		guiAmmoBackground;
 UINT32		guiAmmoGrid;

Laptop/BobbyRGuns.cpp

@@ -5,12 +5,12 @@
 	#include "WCheck.h"
 	#include "WordWrap.h"
 	#include "Cursors.h"
-	#include "interface items.h"
+	#include "Interface Items.h"
 	#include "Encrypted File.h"
-	#include "text.h"
+	#include "Text.h"
 	#include "Store Inventory.h"
 	#include "LaptopSave.h"
-	#include "Finances.h"
+	#include "finances.h"
 	#include "Overhead.h"
 	#include "Weapons.h"
 	#include "GameSettings.h"

Laptop/BobbyRMailOrder.cpp

@@ -10,7 +10,7 @@
 	#include "finances.h"
 	#include "Game Clock.h"
 	#include "Game Event Hook.h"
-	#include "Random.h"
+	#include "random.h"
 	#include "LaptopSave.h"
 	#include "Soldier Profile.h"
 	#include "input.h"
@@ -20,8 +20,8 @@
 	#include "Multi Language Graphic Utils.h"
 	#include "strategic.h"
 	#include "strategicmap.h"
-	#include "isometric utils.h"
-	#include "postalservice.h"
+	#include "Isometric Utils.h"
+	#include "PostalService.h"
 	#include "english.h"
 	#include <list>
 

Laptop/BobbyRShipments.cpp

@@ -1,13 +1,13 @@
 	#include "laptop.h"
 	#include "BobbyRShipments.h"
-	#include "bobbyr.h"
-	#include "utilities.h"
+	#include "BobbyR.h"
+	#include "Utilities.h"
 	#include "WCheck.h"
 	#include "Text.h"
 	#include "BobbyRGuns.h"
-	#include "cursors.h"
+	#include "Cursors.h"
 	#include "BobbyRMailOrder.h"
-	#include "wordwrap.h"
+	#include "WordWrap.h"
 	#include "strategic.h"
 	#include "strategicmap.h"
 	#include "PostalService.h"

Laptop/BriefingRoom.cpp

@@ -1,7 +1,7 @@
 	#include "Utilities.h"
 	#include "WCheck.h"
-	#include "timer control.h"
-	#include "Debug.h"
+	#include "Timer Control.h"
+	#include "DEBUG.H"
 	#include "WordWrap.h"
 	#include "Encrypted File.h"
 	#include "email.h"

Laptop/BriefingRoomM.cpp

@@ -1,7 +1,7 @@
 	#include "Utilities.h"
 	#include "WCheck.h"
-	#include "timer control.h"
-	#include "Debug.h"
+	#include "Timer Control.h"
+	#include "DEBUG.H"
 	#include "WordWrap.h"
 	#include "Encrypted File.h"
 	#include "email.h"

Laptop/BrokenLink.cpp

@@ -1,9 +1,9 @@
-	#include "Types.h"
-	#include "font.h"
+	#include "types.h"
+	#include "Font.h"
 	#include "laptop.h"
 	#include "Font Control.h"
 	#include "Text.h"
-	#include "wordwrap.h"
+	#include "WordWrap.h"
 
 #define		BROKEN_LINK__FONT									FONT12ARIAL
 #define		BROKEN_LINK__COLOR								FONT_MCOLOR_BLACK

Laptop/CampaignHistoryMain.cpp

@@ -10,7 +10,7 @@
 	#include "Utilities.h"
 	#include "WordWrap.h"
 	#include "Cursors.h"
-	#include "Line.h"
+	#include "line.h"
 	#include "Insurance Text.h"
 	#include "Encrypted File.h"
 	#include "Text.h"

Laptop/CampaignStats.cpp

@@ -11,7 +11,7 @@
 #include "Game Clock.h"
 #include "Soldier macros.h"
 #include "Text.h"
-#include "Laptop.h"
+#include "laptop.h"
 #include "LaptopSave.h"
 #include "email.h"
 #include "DynamicDialogue.h"