orbitersim · mdluhosch · May 31, 2024
diff --git a/Src/Orbiter/Astro.h b/Src/Orbiter/Astro.h
@@ -8,7 +8,7 @@
 #define __ASTRO_H
 
 #include <time.h>
-#include "vecmat.h"
+#include "Vecmat.h"
 #include "OrbiterAPI.h"
 
 const double iAU = 1.0/AU;

diff --git a/Src/Orbiter/Celbody.h b/Src/Orbiter/Celbody.h
@@ -9,7 +9,7 @@
 #ifndef __CELBODY_H
 #define __CELBODY_H
 
-#include "RigidBody.h"
+#include "Rigidbody.h"
 #include "OrbiterAPI.h"
 #include "PinesGrav.h"
 
@@ -229,4 +229,4 @@ friend class CELBODY2;
 	bool ephem_parentbary;   // true if body calculates its state with respect to the parent barycentre, false if with respect to parent's true position
 };
 
-#endif
+#endif
diff --git a/Src/Orbiter/Config.cpp b/Src/Orbiter/Config.cpp
@@ -10,6 +10,7 @@
 #define __CONFIG_CPP
 #define STRICT 1
 
+#include <algorithm>
 #include <fstream>
 #include <iomanip>
 #include <string.h>
@@ -1592,4 +1593,4 @@ GDIResources::~GDIResources ()
 	DeleteObject (dlgF1r);
 	DeleteObject (dlgF1i);
 	DeleteObject (dlgF2);
-}
+}
diff --git a/Src/Orbiter/D3dmath.cpp b/Src/Orbiter/D3dmath.cpp
@@ -15,7 +15,7 @@
 #define STRICT
 #include <math.h>
 #include <stdio.h>
-#include "D3DMath.h"
+#include "D3dmath.h"
 
 VOID VMAT_rotx (D3DMATRIX &a, double r)
 {

diff --git a/Src/Orbiter/DialogWin.cpp b/Src/Orbiter/DialogWin.cpp
@@ -5,7 +5,7 @@
 #include "DlgMgr.h"
 #include "OrbiterAPI.h"
 #include "Orbiter.h"
-#include "Resource.h"
+#include "resource.h"
 #include "Log.h"
 
 #define DLG_CAPTIONBUTTON (DLG_CAPTIONCLOSE|DLG_CAPTIONHELP)

diff --git a/Src/Orbiter/Dialogs.cpp b/Src/Orbiter/Dialogs.cpp
@@ -15,7 +15,7 @@
 #include "Camera.h"
 #include "Pane.h"
 #include "Nav.h"
-#include "Resource.h"
+#include "resource.h"
 #include "Dialogs.h"
 #include "DlgMgr.h" // to be removed
 

diff --git a/Src/Orbiter/DlgCamera.cpp b/Src/Orbiter/DlgCamera.cpp
@@ -9,12 +9,12 @@
 
 #include "DlgCamera.h"
 #include "DlgMgr.h"
-#include "Resource.h"
-#include "Resource2.h"
+#include "resource.h"
+#include "resource2.h"
 #include "Orbiter.h"
 #include "Psys.h"
 #include "Camera.h"
-#include "Uxtheme.h"
+#include <uxtheme.h>
 #include "DlgCtrl.h"
 
 using std::min;

diff --git a/Src/Orbiter/DlgCamera.h b/Src/Orbiter/DlgCamera.h
@@ -8,8 +8,9 @@
 #ifndef __DLGCAMERA_H
 #define __DLGCAMERA_H
 
+#include <windows.h>
+#include <commctrl.h>
 #include "DialogWin.h"
-#include "CommCtrl.h"
 #include "Celbody.h"
 #include "Camera.h"
 
@@ -170,4 +171,4 @@ class TabPreset: public CameraTab {
 	static INT_PTR CALLBACK DlgProc (HWND, UINT, WPARAM, LPARAM);
 };
 
-#endif // !__DLGCAMERA_H
+#endif // !__DLGCAMERA_H
diff --git a/Src/Orbiter/DlgCapture.cpp b/Src/Orbiter/DlgCapture.cpp
@@ -10,8 +10,8 @@
 #include <windows.h>
 #include "DlgCapture.h"
 #include "Orbiter.h"
-#include "Resource.h"
-#include "Resource2.h"
+#include "resource.h"
+#include "resource2.h"
 #include <string>
 
 extern Orbiter *g_pOrbiter;
@@ -187,4 +187,4 @@ bool DlgCapture::AutoIncrement (HWND hDlg)
 		return true;
 	}
 	return false;
-}
+}
diff --git a/Src/Orbiter/DlgFocus.cpp b/Src/Orbiter/DlgFocus.cpp
@@ -8,14 +8,14 @@
 #define STRICT 1
 
 #include "DlgFocus.h"
-#include "Resource.h"
+#include "resource.h"
 #include "Orbiter.h"
 #include "Psys.h"
 #include "SuperVessel.h"
 #include "Pane.h"
 #include "Camera.h"
 #include "Util.h"
-#include "Uxtheme.h"
+#include <uxtheme.h>
 #include <iomanip>
 
 extern Orbiter *g_pOrbiter;
@@ -572,4 +572,4 @@ HTREEITEM DlgFocus::FindItem (HWND hDlg, const char *str, HTREEITEM hti_first)
 		hti_first = (HTREEITEM)SendDlgItemMessage (hDlg, IDC_TREE1, TVM_GETNEXTITEM, TVGN_NEXT, (LPARAM)hti_first);
 	} while (hti_first);
 	return NULL;
-}
+}
diff --git a/Src/Orbiter/DlgFocus.h b/Src/Orbiter/DlgFocus.h
@@ -8,8 +8,10 @@
 #ifndef __DLGFOCUS_H
 #define __DLGFOCUS_H
 
+#include <windows.h>
+#include <commctrl.h>
+
 #include "DialogWin.h"
-#include "CommCtrl.h"
 
 class DlgFocus: public DialogWin {
 public:
@@ -46,4 +48,4 @@ class DlgFocus: public DialogWin {
 	RECT rClient, rTab, rEdit, rTree, rAppl, rPrev, rHelp, rClse, rSldr, rLabl, rChck;
 };
 
-#endif // !__DLGFOCUS_H
+#endif // !__DLGFOCUS_H
diff --git a/Src/Orbiter/DlgFunction.cpp b/Src/Orbiter/DlgFunction.cpp
@@ -9,8 +9,8 @@
 
 #include "DlgFunction.h"
 #include "Orbiter.h"
-#include "Resource.h"
-#include "Resource2.h"
+#include "resource.h"
+#include "resource2.h"
 
 extern Orbiter *g_pOrbiter;
 extern HELPCONTEXT DefHelpContext;

diff --git a/Src/Orbiter/DlgHelp.cpp b/Src/Orbiter/DlgHelp.cpp
@@ -10,7 +10,7 @@
 #include "DlgHelp.h"
 #include "DlgMgr.h"
 #include "Orbiter.h"
-#include "Resource.h"
+#include "resource.h"
 #include <htmlhelp.h>
 #include <io.h>
 

diff --git a/Src/Orbiter/DlgInfo.cpp b/Src/Orbiter/DlgInfo.cpp
@@ -12,7 +12,7 @@
 #include <windows.h>
 #include "DlgInfo.h"
 #include "Dialogs.h"
-#include "Resource.h"
+#include "resource.h"
 #include "DlgMgr.h" // to be removed
 #include "Orbiter.h"
 #include "Vessel.h"
@@ -21,7 +21,7 @@
 #include "Celbody.h"
 #include <windows.h>
 #include <commctrl.h>
-#include <Richedit.h>
+#include <richedit.h>
 #include "Element.h"
 
 extern Orbiter *g_pOrbiter;

diff --git a/Src/Orbiter/DlgMap.cpp b/Src/Orbiter/DlgMap.cpp
@@ -13,7 +13,7 @@
 #include "Orbiter.h"
 #include "Psys.h"
 #include "Planet.h"
-#include "Resource.h"
+#include "resource.h"
 #include "DlgMgr.h" // to be removed
 #include "Pane.h"
 #include "Util.h"

diff --git a/Src/Orbiter/DlgMenuCfg.cpp b/Src/Orbiter/DlgMenuCfg.cpp
@@ -11,8 +11,8 @@
 #include "Pane.h"
 #include "MenuInfoBar.h"
 #include "DlgMenuCfg.h"
-#include "Resource.h"
-#include "Resource2.h"
+#include "resource.h"
+#include "resource2.h"
 #include "DlgCtrl.h"
 
 extern Orbiter *g_pOrbiter;

diff --git a/Src/Orbiter/DlgMgr.cpp b/Src/Orbiter/DlgMgr.cpp
@@ -4,7 +4,7 @@
 #include <stdio.h>
 #include "GraphicsAPI.h"
 #include "DlgMgr.h"
-#include "Resource.h"
+#include "resource.h"
 #include "Orbiter.h"
 #include "Log.h"
 

diff --git a/Src/Orbiter/DlgOptions.cpp b/Src/Orbiter/DlgOptions.cpp
@@ -16,7 +16,7 @@
 #include "Camera.h"
 #include "DlgCtrl.h"
 #include "resource.h"
-#include "Uxtheme.h"
+#include <uxtheme.h>
 #include <commctrl.h>
 
 extern Orbiter* g_pOrbiter;

diff --git a/Src/Orbiter/DlgRecorder.cpp b/Src/Orbiter/DlgRecorder.cpp
@@ -9,8 +9,8 @@
 
 #include "DlgRecorder.h"
 #include "Orbiter.h"
-#include "Resource.h"
-#include "Resource2.h"
+#include "resource.h"
+#include "resource2.h"
 
 extern Orbiter *g_pOrbiter;
 extern Vessel *g_focusobj;

diff --git a/Src/Orbiter/Launchpad.cpp b/Src/Orbiter/Launchpad.cpp
@@ -7,9 +7,9 @@
 #include <io.h>
 #include <time.h>
 #include <fstream>
-#include "Uxtheme.h"
+#include <uxtheme.h>
 #include <commctrl.h>
-#include "Resource.h"
+#include "resource.h"
 #include "Orbiter.h"
 #include "Launchpad.h"
 #include "TabScenario.h"

diff --git a/Src/Orbiter/Launchpad.h b/Src/Orbiter/Launchpad.h
@@ -4,7 +4,7 @@
 #ifndef __LAUNCHPAD_H
 #define __LAUNCHPAD_H
 
-#include <CommCtrl.h>
+#include <commctrl.h>
 #include "OrbiterAPI.h"
 #include "Config.h"
 
@@ -153,4 +153,4 @@ namespace orbiter {
 
 }
 
-#endif // !__LAUNCHPAD_H
+#endif // !__LAUNCHPAD_H
diff --git a/Src/Orbiter/MenuInfoBar.cpp b/Src/Orbiter/MenuInfoBar.cpp
@@ -4,7 +4,7 @@
 #include "MenuInfoBar.h"
 #include "Pane.h"
 #include "Camera.h"
-#include "Resource.h"
+#include "resource.h"
 #include "Dialogs.h"
 #include "DlgMgr.h"
 #include "DlgMenuCfg.h"

diff --git a/Src/Orbiter/MfdAlign.cpp b/Src/Orbiter/MfdAlign.cpp
@@ -22,7 +22,7 @@ static const Body *last_target = 0;
 // =======================================================================
 // class Instrument_OPlaneAlign
 
-struct Instrument_OPlaneAlign::SavePrm Instrument_OPlaneAlign::saveprm = {0,0,0,0.0,0.0,false};
+struct Instrument_OPlaneAlign::SavePrm Instrument_OPlaneAlign::saveprm = {0,0,0,false,0.0,0.0};
 
 Instrument_OPlaneAlign::Instrument_OPlaneAlign (Pane *_pane, INT_PTR _id, const Spec &spec, Vessel *_vessel, bool restore)
 : Instrument (_pane, _id, spec, _vessel)

diff --git a/Src/Orbiter/OptionsPages.cpp b/Src/Orbiter/OptionsPages.cpp
@@ -13,7 +13,7 @@
 #include "Psys.h"
 #include "Camera.h"
 #include "resource.h"
-#include "Uxtheme.h"
+#include <uxtheme.h>
 
 using std::min;
 using std::max;

diff --git a/Src/Orbiter/OptionsPages.h b/Src/Orbiter/OptionsPages.h
@@ -14,7 +14,7 @@
 #define __OPTIONSPAGES_H
 
 #include <windows.h>
-#include <CommCtrl.h>
+#include <commctrl.h>
 #include "CustomControls.h"
 #include "OrbiterAPI.h"
 
@@ -458,4 +458,4 @@ class OptionsPage_Axes : public OptionsPage {
 	BOOL OnHScroll(HWND hTab, WPARAM wParam, LPARAM lParam);
 };
 
-#endif // !__OPTIONSPAGES_H
+#endif // !__OPTIONSPAGES_H
diff --git a/Src/Orbiter/PlaybackEd.cpp b/Src/Orbiter/PlaybackEd.cpp
@@ -5,7 +5,7 @@
 #include "DlgMgr.h" // remove
 #include "Camera.h"
 #include "Log.h"
-#include "Resource.h"
+#include "resource.h"
 
 using namespace std;
 

diff --git a/Src/Orbiter/TabModule.cpp b/Src/Orbiter/TabModule.cpp
@@ -11,6 +11,8 @@
 #include "TabModule.h"
 #include "resource.h"
 #include <filesystem>
+#include <algorithm>
+
 namespace fs = std::filesystem;
 
 using std::max;

diff --git a/Src/Orbiter/TabScenario.h b/Src/Orbiter/TabScenario.h
@@ -9,7 +9,7 @@
 #ifndef __TABSCENARIO_H
 #define __TABSCENARIO_H
 
-#include <CommCtrl.h>
+#include <commctrl.h>
 #include "LpadTab.h"
 #include "CustomControls.h"
 #include <filesystem>
@@ -91,4 +91,4 @@ namespace orbiter {
 
 }
 
-#endif // !__TABSCENARIO_H
+#endif // !__TABSCENARIO_H
diff --git a/Src/Orbiter/TimeData.h b/Src/Orbiter/TimeData.h
@@ -1,6 +1,7 @@
 #ifndef TIMEDATA_H
 #define TIMEDATA_H
 
+#include <cstddef>
 //-----------------------------------------------------------------------------
 // Name: class TimeData
 // Desc: stores timing information for current time step
@@ -72,4 +73,4 @@ struct TimeJumpData {
 	int mode;
 };
 
-#endif
+#endif
diff --git a/Src/Orbiter/VectorMap.cpp b/Src/Orbiter/VectorMap.cpp
@@ -8,7 +8,7 @@
 
 #include "VectorMap.h"
 #include "Psys.h"
-#include "MFD.h"
+#include "Mfd.h"
 #include "Util.h"
 
 #define OUTLINE_COAST 1
@@ -1681,4 +1681,4 @@ void Groundtrack::Update ()
 		vupdt = (vupdt+1) % nvtx;
 	}
 	omega_updt = fabs (omega_updt);
-}
+}