diff --git a/core/apps/difftools/rnwdiff.cpp b/core/apps/difftools/rnwdiff.cpp index 6da6467ff..ef5aadbd0 100644 --- a/core/apps/difftools/rnwdiff.cpp +++ b/core/apps/difftools/rnwdiff.cpp @@ -34,7 +34,7 @@ // //============================================================================= -#include +#include "RINEX3/Rinex3ObsFilterOperators.hpp" #include "FileFilterFrameWithHeader.hpp" #include "Rinex3NavData.hpp" diff --git a/core/apps/time/timediff.cpp b/core/apps/time/timediff.cpp index c7b464e0e..5af795c40 100644 --- a/core/apps/time/timediff.cpp +++ b/core/apps/time/timediff.cpp @@ -35,9 +35,9 @@ //============================================================================= -#include -#include -#include +#include "BasicFramework.hpp" +#include "CommonTime.hpp" +#include "CommandOptionWithCommonTimeArg.hpp" using namespace std; using namespace gpstk; diff --git a/core/lib/GNSSEph/NMCTMeta.hpp b/core/lib/GNSSEph/NMCTMeta.hpp index 51cebc1ed..88c16da34 100644 --- a/core/lib/GNSSEph/NMCTMeta.hpp +++ b/core/lib/GNSSEph/NMCTMeta.hpp @@ -44,7 +44,7 @@ #define NMCTMETA_HPP #include -#include +#include "CommonTime.hpp" namespace gpstk { diff --git a/core/lib/NavFilter/CNavCookFilter.hpp b/core/lib/NavFilter/CNavCookFilter.hpp index 0f3cd19ca..67b1901bb 100644 --- a/core/lib/NavFilter/CNavCookFilter.hpp +++ b/core/lib/NavFilter/CNavCookFilter.hpp @@ -37,8 +37,8 @@ #ifndef CNAVCOOKFILTER_HPP #define CNAVCOOKFILTER_HPP -#include -#include +#include "NavFilter.hpp" +#include "CNavFilterData.hpp" namespace gpstk { diff --git a/core/lib/NavFilter/CNavCrossSourceFilter.hpp b/core/lib/NavFilter/CNavCrossSourceFilter.hpp index 6fcae3da5..155d8b09e 100644 --- a/core/lib/NavFilter/CNavCrossSourceFilter.hpp +++ b/core/lib/NavFilter/CNavCrossSourceFilter.hpp @@ -1,9 +1,9 @@ #ifndef CNAVCROSSOURCEFILTER_HPP #define CNAVCROSSOURCEFILTER_HPP -#include -#include -#include +#include "NavFilterMgr.hpp" +#include "NavFilter.hpp" +#include "CNavFilterData.hpp" namespace gpstk { diff --git a/core/lib/NavFilter/CNavEmptyFilter.hpp b/core/lib/NavFilter/CNavEmptyFilter.hpp index ef37fa002..94a6f08c6 100644 --- a/core/lib/NavFilter/CNavEmptyFilter.hpp +++ b/core/lib/NavFilter/CNavEmptyFilter.hpp @@ -36,7 +36,7 @@ #ifndef CNAVEMPTYFILTER_HPP #define CNAVEMPTYFILTER_HPP -#include +#include "NavFilter.hpp" namespace gpstk { diff --git a/core/lib/NavFilter/CNavParityFilter.hpp b/core/lib/NavFilter/CNavParityFilter.hpp index b4da69e89..912b21e89 100644 --- a/core/lib/NavFilter/CNavParityFilter.hpp +++ b/core/lib/NavFilter/CNavParityFilter.hpp @@ -37,7 +37,7 @@ #ifndef CNAVPARITYFILTER_HPP #define CNAVPARITYFILTER_HPP -#include +#include "NavFilter.hpp" namespace gpstk { diff --git a/core/lib/NavFilter/CNavTOWFilter.hpp b/core/lib/NavFilter/CNavTOWFilter.hpp index e9feb2b0c..7c122c78a 100644 --- a/core/lib/NavFilter/CNavTOWFilter.hpp +++ b/core/lib/NavFilter/CNavTOWFilter.hpp @@ -36,7 +36,7 @@ #ifndef CNAVTOWFILTER_HPP #define CNAVTOWFILTER_HPP -#include +#include "NavFilter.hpp" namespace gpstk { diff --git a/core/lib/NavFilter/LNavAlmValFilter.hpp b/core/lib/NavFilter/LNavAlmValFilter.hpp index fde672c88..d50cc56db 100644 --- a/core/lib/NavFilter/LNavAlmValFilter.hpp +++ b/core/lib/NavFilter/LNavAlmValFilter.hpp @@ -1,8 +1,8 @@ #ifndef LNAVALMVALFILTER_HPP #define LNAVALMVALFILTER_HPP -#include -#include +#include "NavFilter.hpp" +#include "LNavFilterData.hpp" namespace gpstk { diff --git a/core/lib/NavFilter/LNavCookFilter.hpp b/core/lib/NavFilter/LNavCookFilter.hpp index 69ef2ec95..c3bee5e04 100644 --- a/core/lib/NavFilter/LNavCookFilter.hpp +++ b/core/lib/NavFilter/LNavCookFilter.hpp @@ -1,8 +1,8 @@ #ifndef LNAVCOOKFILTER_HPP #define LNAVCOOKFILTER_HPP -#include -#include +#include "NavFilter.hpp" +#include "LNavFilterData.hpp" namespace gpstk { diff --git a/core/lib/NavFilter/LNavCrossSourceFilter.hpp b/core/lib/NavFilter/LNavCrossSourceFilter.hpp index f8988d89f..617eede1c 100644 --- a/core/lib/NavFilter/LNavCrossSourceFilter.hpp +++ b/core/lib/NavFilter/LNavCrossSourceFilter.hpp @@ -1,9 +1,9 @@ #ifndef LNAVCROSSOURCEFILTER_HPP #define LNAVCROSSOURCEFILTER_HPP -#include -#include -#include +#include "NavFilterMgr.hpp" +#include "NavFilter.hpp" +#include "LNavFilterData.hpp" namespace gpstk { diff --git a/core/lib/NavFilter/LNavEmptyFilter.hpp b/core/lib/NavFilter/LNavEmptyFilter.hpp index 0de9651e0..e0ae8b1a1 100644 --- a/core/lib/NavFilter/LNavEmptyFilter.hpp +++ b/core/lib/NavFilter/LNavEmptyFilter.hpp @@ -1,7 +1,7 @@ #ifndef LNAVEMPTYFILTER_HPP #define LNAVEMPTYFILTER_HPP -#include +#include "NavFilter.hpp" namespace gpstk { diff --git a/core/lib/NavFilter/LNavEphMaker.hpp b/core/lib/NavFilter/LNavEphMaker.hpp index df0fff0ed..ee9f98cfc 100644 --- a/core/lib/NavFilter/LNavEphMaker.hpp +++ b/core/lib/NavFilter/LNavEphMaker.hpp @@ -1,8 +1,8 @@ #ifndef LNAVEPHMAKER_HPP #define LNAVEPHMAKER_HPP -#include -#include +#include "NavFilter.hpp" +#include "LNavFilterData.hpp" namespace gpstk { diff --git a/core/lib/NavFilter/LNavFilterData.hpp b/core/lib/NavFilter/LNavFilterData.hpp index 94f60bef4..b9c06189f 100644 --- a/core/lib/NavFilter/LNavFilterData.hpp +++ b/core/lib/NavFilter/LNavFilterData.hpp @@ -37,7 +37,7 @@ #define LNAVFILTERDATA_HPP #include -#include +#include "NavFilterKey.hpp" namespace gpstk { diff --git a/core/lib/NavFilter/LNavParityFilter.hpp b/core/lib/NavFilter/LNavParityFilter.hpp index f54c65620..43c4744a1 100644 --- a/core/lib/NavFilter/LNavParityFilter.hpp +++ b/core/lib/NavFilter/LNavParityFilter.hpp @@ -1,7 +1,7 @@ #ifndef LNAVPARITYFILTER_HPP #define LNAVPARITYFILTER_HPP -#include +#include "NavFilter.hpp" namespace gpstk { diff --git a/core/lib/NavFilter/LNavTLMHOWFilter.hpp b/core/lib/NavFilter/LNavTLMHOWFilter.hpp index 595522fb7..b9f4627a9 100644 --- a/core/lib/NavFilter/LNavTLMHOWFilter.hpp +++ b/core/lib/NavFilter/LNavTLMHOWFilter.hpp @@ -1,7 +1,7 @@ #ifndef LNAVTLMHOWFILTER_HPP #define LNAVTLMHOWFILTER_HPP -#include +#include "NavFilter.hpp" namespace gpstk { diff --git a/core/lib/NavFilter/NavFilter.hpp b/core/lib/NavFilter/NavFilter.hpp index a8bfeb67f..cb6fd28c5 100644 --- a/core/lib/NavFilter/NavFilter.hpp +++ b/core/lib/NavFilter/NavFilter.hpp @@ -4,8 +4,8 @@ #include #include #include -#include -#include +#include "ObsID.hpp" +#include "NavFilterKey.hpp" namespace gpstk { diff --git a/core/lib/NavFilter/NavFilterKey.hpp b/core/lib/NavFilter/NavFilterKey.hpp index 07028dd5c..a4a9984b7 100644 --- a/core/lib/NavFilter/NavFilterKey.hpp +++ b/core/lib/NavFilter/NavFilterKey.hpp @@ -2,9 +2,9 @@ #define NAVFILTERKEY_HPP #include -#include -#include -#include +#include "ObsID.hpp" +#include "CommonTime.hpp" +#include "gpstkplatform.h" namespace gpstk { diff --git a/core/lib/NavFilter/NavFilterMgr.hpp b/core/lib/NavFilter/NavFilterMgr.hpp index 063a3de1d..67fba1694 100644 --- a/core/lib/NavFilter/NavFilterMgr.hpp +++ b/core/lib/NavFilter/NavFilterMgr.hpp @@ -3,7 +3,7 @@ #include #include -#include +#include "NavFilter.hpp" namespace gpstk { diff --git a/ext/apps/geomatics/relposition/DDBase.cpp b/ext/apps/geomatics/relposition/DDBase.cpp index f2e96132e..7b84a4231 100644 --- a/ext/apps/geomatics/relposition/DDBase.cpp +++ b/ext/apps/geomatics/relposition/DDBase.cpp @@ -43,7 +43,7 @@ //------------------------------------------------------------------------------------ // system includes #include "TimeString.hpp" -#include +#include "CivilTime.hpp" #include // GPSTk diff --git a/ext/apps/rfw/rfw.cpp b/ext/apps/rfw/rfw.cpp index 5c8dc0aa6..f2a5772a1 100644 --- a/ext/apps/rfw/rfw.cpp +++ b/ext/apps/rfw/rfw.cpp @@ -45,10 +45,10 @@ #include /* Error number definitions */ #include /* POSIX terminal control definitions */ -#include -#include -#include -#include +#include "StringUtils.hpp" +#include "LoopedFramework.hpp" +#include "CommandOption.hpp" +#include "TimeNamedFileStream.hpp" #include "DeviceStream.hpp" diff --git a/ext/apps/swrx/IQStream.hpp b/ext/apps/swrx/IQStream.hpp index 4aa2b9a6f..3bbfcf50e 100644 --- a/ext/apps/swrx/IQStream.hpp +++ b/ext/apps/swrx/IQStream.hpp @@ -41,8 +41,8 @@ #include #include -#include -#include +#include "gpstkplatform.h" +#include "FFBinaryStream.hpp" namespace gpstk { diff --git a/ext/apps/swrx/RX.cpp b/ext/apps/swrx/RX.cpp index b78db2674..6a95b000a 100644 --- a/ext/apps/swrx/RX.cpp +++ b/ext/apps/swrx/RX.cpp @@ -67,14 +67,14 @@ hilbert -i data.bin | ./RX -b 1 -q 2 -x 4.13 -r 8.184 -c c:1:30:416.789:-8800 -c #include "complex_math.h" #include "IQStream.hpp" #include "NavFramer.hpp" -#include -#include -#include -#include -#include -#include -#include -#include +#include "CommonTime.hpp" +#include "GPSEphemerisStore.hpp" +#include "RinexNavStream.hpp" +#include "RinexNavData.hpp" +#include "GGTropModel.hpp" +#include "IonoModel.hpp" +#include "GPSEllipsoid.hpp" +#include "PRSolution2.hpp" using namespace gpstk; using namespace std; diff --git a/ext/apps/swrx/hilbert.cpp b/ext/apps/swrx/hilbert.cpp index 76bfd62f4..0b8b7dbfe 100644 --- a/ext/apps/swrx/hilbert.cpp +++ b/ext/apps/swrx/hilbert.cpp @@ -56,8 +56,8 @@ g++ -o hilbert hilbert.o /.../gpstk/dev/apps/swrx/simlib.a /.../gpstk/dev/src/li #include #include #include -#include -#include +#include "CommandOption.hpp" +#include "CommandOptionParser.hpp" #include "BasicFramework.hpp" #include "IQStream.hpp" using namespace gpstk; diff --git a/ext/apps/swrx/position.cpp b/ext/apps/swrx/position.cpp index 9e824edfc..488cacf09 100644 --- a/ext/apps/swrx/position.cpp +++ b/ext/apps/swrx/position.cpp @@ -48,15 +48,15 @@ We then solve for position. #include "GNSSconstants.hpp" #include "Position.hpp" #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "CommonTime.hpp" +#include "GPSWeekZcount.hpp" +#include "GPSEphemerisStore.hpp" +#include "RinexNavStream.hpp" +#include "RinexNavData.hpp" +#include "GGTropModel.hpp" +#include "IonoModel.hpp" +#include "GPSEllipsoid.hpp" +#include "PRSolution2.hpp" using namespace gpstk; using namespace std; diff --git a/ext/apps/swrx/simpleNav.cpp b/ext/apps/swrx/simpleNav.cpp index 3fa42aeb6..b25ede00e 100644 --- a/ext/apps/swrx/simpleNav.cpp +++ b/ext/apps/swrx/simpleNav.cpp @@ -42,19 +42,19 @@ tries to estimate the pseudoranges from the correlation delays. #include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include +#include "CommonTime.hpp" +#include "CommandOption.hpp" +#include "CommandOptionWithTimeArg.hpp" +#include "CommandOptionParser.hpp" + +#include "GPSEphemerisStore.hpp" +#include "RinexNavStream.hpp" +#include "RinexNavData.hpp" +#include "GGTropModel.hpp" +#include "IonoModel.hpp" +#include "GPSEllipsoid.hpp" +#include "PRSolution2.hpp" +#include "Position.hpp" #include "Xvt.hpp" using namespace gpstk; diff --git a/ext/lib/Rxio/AshtechData.hpp b/ext/lib/Rxio/AshtechData.hpp index b15f8e92e..c3473ba2f 100644 --- a/ext/lib/Rxio/AshtechData.hpp +++ b/ext/lib/Rxio/AshtechData.hpp @@ -45,12 +45,12 @@ #include #include -#include -#include -#include +#include "Exception.hpp" +#include "StringUtils.hpp" +#include "BinUtils.hpp" -#include -#include +#include "FFData.hpp" +#include "FFStream.hpp" #include "DataStatus.hpp" namespace gpstk