From 467cd1ced6f66b4be85bb9072a53fe6f70ffdc0d Mon Sep 17 00:00:00 2001 From: Paul Gilman Date: Mon, 21 Oct 2024 16:27:24 -0700 Subject: [PATCH] Clean up includes --- shared/lib_financial.h | 6 ++++++ ssc/cmod_cashloan.cpp | 4 ---- ssc/cmod_communitysolar.cpp | 6 ------ ssc/cmod_equpartflip.cpp | 7 ------- ssc/cmod_host_developer.cpp | 7 ------- ssc/cmod_levpartflip.cpp | 8 -------- ssc/cmod_merchantplant.cpp | 5 ----- ssc/cmod_saleleaseback.cpp | 8 -------- ssc/cmod_singleowner.cpp | 7 ------- ssc/cmod_thirdpartyownership.cpp | 2 -- 10 files changed, 6 insertions(+), 54 deletions(-) diff --git a/shared/lib_financial.h b/shared/lib_financial.h index 16342fabf..9e57b0f3c 100644 --- a/shared/lib_financial.h +++ b/shared/lib_financial.h @@ -34,6 +34,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define __lib_financial_h #include +#include + +#ifndef WIN32 +#include +#endif + namespace libfin { double min(double a, double b); diff --git a/ssc/cmod_cashloan.cpp b/ssc/cmod_cashloan.cpp index f4f5058af..e050d3721 100644 --- a/ssc/cmod_cashloan.cpp +++ b/ssc/cmod_cashloan.cpp @@ -29,16 +29,12 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include #include "core.h" #include "lib_financial.h" #include "lib_util.h" #include "common_financial.h" -#include - static var_info vtab_cashloan[] = { /* VARTYPE DATATYPE NAME LABEL UNITS META GROUP REQUIRED_IF CONSTRAINTS UI_HINTS*/ diff --git a/ssc/cmod_communitysolar.cpp b/ssc/cmod_communitysolar.cpp index 88150ddd7..d43f6d1c9 100644 --- a/ssc/cmod_communitysolar.cpp +++ b/ssc/cmod_communitysolar.cpp @@ -33,12 +33,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "common_financial.h" #include "lib_financial.h" -#include - -#ifndef WIN32 -#include -#endif - static var_info _cm_vtab_communitysolar[] = { /* VARTYPE DATATYPE NAME LABEL UNITS META GROUP REQUIRED_IF CONSTRAINTS UI_HINTS*/ diff --git a/ssc/cmod_equpartflip.cpp b/ssc/cmod_equpartflip.cpp index c1abd5f85..92abb3561 100644 --- a/ssc/cmod_equpartflip.cpp +++ b/ssc/cmod_equpartflip.cpp @@ -30,17 +30,10 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #include "common_financial.h" #include "common.h" #include "lib_financial.h" -#include - -#ifndef WIN32 -#include -#endif - /* Very close to cmod_levpartflip diff --git a/ssc/cmod_host_developer.cpp b/ssc/cmod_host_developer.cpp index 80c85ce76..444ff3bed 100644 --- a/ssc/cmod_host_developer.cpp +++ b/ssc/cmod_host_developer.cpp @@ -30,17 +30,10 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #include "common_financial.h" #include "common.h" #include "lib_financial.h" -#include - -#ifndef WIN32 -#include -#endif - static var_info _cm_vtab_host_developer[] = { /* VARTYPE DATATYPE NAME LABEL UNITS META GROUP REQUIRED_IF CONSTRAINTS UI_HINTS*/ diff --git a/ssc/cmod_levpartflip.cpp b/ssc/cmod_levpartflip.cpp index c31f05809..3b088321a 100644 --- a/ssc/cmod_levpartflip.cpp +++ b/ssc/cmod_levpartflip.cpp @@ -30,18 +30,10 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #include "common_financial.h" #include "common.h" #include "lib_financial.h" -#include - -#ifndef WIN32 -#include -#endif - - static var_info _cm_vtab_levpartflip[] = { diff --git a/ssc/cmod_merchantplant.cpp b/ssc/cmod_merchantplant.cpp index 5775ad86d..b5ec95c2c 100644 --- a/ssc/cmod_merchantplant.cpp +++ b/ssc/cmod_merchantplant.cpp @@ -30,11 +30,6 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include - -#ifndef WIN32 -#include -#endif #include "common_financial.h" #include "common.h" #include "lib_financial.h" diff --git a/ssc/cmod_saleleaseback.cpp b/ssc/cmod_saleleaseback.cpp index 4bebe4ac5..513261bf5 100644 --- a/ssc/cmod_saleleaseback.cpp +++ b/ssc/cmod_saleleaseback.cpp @@ -30,18 +30,10 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #include "common_financial.h" #include "common.h" #include "lib_financial.h" -#include - -#ifndef WIN32 -#include -#endif - - static var_info _cm_vtab_saleleaseback[] = { diff --git a/ssc/cmod_singleowner.cpp b/ssc/cmod_singleowner.cpp index 8e19883d7..879ecbf93 100644 --- a/ssc/cmod_singleowner.cpp +++ b/ssc/cmod_singleowner.cpp @@ -30,17 +30,10 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #include "common_financial.h" #include "common.h" #include "lib_financial.h" -#include - -#ifndef WIN32 -#include -#endif - static var_info _cm_vtab_singleowner[] = { /* VARTYPE DATATYPE NAME LABEL UNITS META GROUP REQUIRED_IF CONSTRAINTS UI_HINTS*/ diff --git a/ssc/cmod_thirdpartyownership.cpp b/ssc/cmod_thirdpartyownership.cpp index bef5452fd..adf8cae6f 100644 --- a/ssc/cmod_thirdpartyownership.cpp +++ b/ssc/cmod_thirdpartyownership.cpp @@ -33,8 +33,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "core.h" #include "lib_financial.h" #include "common_financial.h" -#include - static var_info vtab_thirdpartyownership[] = { /* VARTYPE DATATYPE NAME LABEL UNITS META GROUP REQUIRED_IF CONSTRAINTS UI_HINTS*/