Index: trunk/BNC/src/PPP/pppInclude.h
===================================================================
--- trunk/BNC/src/PPP/pppInclude.h	(revision 6043)
+++ 	(revision )
@@ -1,198 +1,0 @@
-#ifndef PPP_H
-#define PPP_H
-
-#include <string>
-#include <vector>
-#include <newmat.h>
-
-#include "bncconst.h"
-#include "bnctime.h"
-#include "t_prn.h"
-
-namespace BNC_PPP {
-
-class t_except {
- public:
-  t_except(const char* msg) {
-    _msg = msg;
-  }
-  ~t_except() {}
-  std::string what() {return _msg;}
- private:
-  std::string _msg;
-};
-
-class t_output {
- public:
-  bncTime      _epoTime;           
-  double       _xyzRover[3];  
-  double       _covMatrix[6]; 
-  double       _neu[3];  
-  int          _numSat;       
-  double       _pDop;         
-  std::string  _log;          
-  bool         _error;        
-};
-
-class t_frqObs  {
- public:
-  t_frqObs() {
-    _code            = 0.0;          
-    _codeValid       = false;     
-    _phase           = 0.0;         
-    _phaseValid      = false;    
-    _doppler         = 0.0;       
-    _dopplerValid    = false;  
-    _snr             = 0.0;           
-    _snrValid        = false;      
-    _slip            = false;          
-    _slipCounter     = 0;   
-    _biasJumpCounter = 0;
-  }
-  std::string       _rnxType2ch; 
-  double            _code;          
-  bool              _codeValid;     
-  double            _phase;         
-  bool              _phaseValid;    
-  double            _doppler;       
-  bool              _dopplerValid;  
-  double            _snr;           
-  bool              _snrValid;      
-  bool              _slip;          
-  int               _slipCounter;   
-  int               _biasJumpCounter;
-};
-
-class t_satObs {
- public:
-  t_satObs() {}
-  ~t_satObs() {for (unsigned ii = 0; ii < _obs.size(); ii++) delete _obs[ii];}
-  t_prn                  _prn;
-  bncTime                _time;
-  std::vector<t_frqObs*> _obs;
-};
-
-class t_orbCorr {
- public:
-  t_prn          prn() const {return _prn;}
-  unsigned short IOD() const {return _iod;}
-  t_prn          _prn;
-  unsigned short _iod;
-  bncTime        _time;
-  char           _system;
-  double         _xr[3];
-  double         _dotXr[3]; 
-};
-
-class t_clkCorr {
- public:
-  t_prn          prn() const {return _prn;}
-  unsigned short IOD() const {return _iod;}
-  t_prn          _prn;
-  unsigned short _iod;
-  bncTime        _time;
-  double         _dClk;
-  double         _dotDClk;
-  double         _dotDotDClk;
-  double         _clkPartial;
-};
-
-class t_frqBias {
- public:
-  t_frqBias() {
-    _code       = 0.0;          
-    _codeValid  = false;     
-    _phase      = 0.0;         
-    _phaseValid = false;    
-  }
-  std::string _rnxType2ch;
-  double      _code;          
-  bool        _codeValid;     
-  double      _phase;         
-  bool        _phaseValid;    
-};
-
-class t_satBias {
- public:
-  t_prn                  _prn;
-  bncTime                _time;
-  int                    _nx;
-  int                    _jumpCount;
-  std::vector<t_frqBias> _bias;
-};
-
-class t_lc {
- public:
-  enum type {dummy = 0, l1, l2, c1, c2, lIF, cIF, MW, CL, maxLc};
-
-  static bool includesPhase(type tt) {
-    switch (tt) {
-    case l1:
-    case l2:
-    case lIF:
-    case MW:
-    case CL:
-      return true;
-    case c1:
-    case c2:
-    case cIF:
-      return false;
-    case dummy: case maxLc: return false;
-    }
-    return false;
-  }
-
-  static bool includesCode(type tt) {
-    switch (tt) {
-    case c1:
-    case c2:
-    case cIF:
-    case MW:
-    case CL:
-      return true;
-    case l1:
-    case l2:
-    case lIF:
-      return false;
-    case dummy: case maxLc: return false;
-    }
-    return false;
-  }
-
-  static t_frequency::type toFreq(char sys, type tt) {
-    switch (tt) {
-    case l1: case c1:
-      if      (sys == 'G') return t_frequency::G1;
-      else if (sys == 'R') return t_frequency::R1;
-      else if (sys == 'E') return t_frequency::E1;
-      else                 return t_frequency::dummy;
-    case l2: case c2:
-      if      (sys == 'G') return t_frequency::G2;
-      else if (sys == 'R') return t_frequency::R2;
-      else                 return t_frequency::dummy;
-    case lIF: case cIF: case MW: case CL: 
-      return t_frequency::dummy;
-    case dummy: case maxLc: return t_frequency::dummy;
-    }
-    return t_frequency::dummy;
-  }
-
-  static std::string toString(type tt) {
-    switch (tt) {
-    case l1:  return "l1";
-    case l2:  return "l2";
-    case lIF: return "lIF";
-    case MW:  return "MW";
-    case CL:  return "CL";
-    case c1:  return "c1";
-    case c2:  return "c2";
-    case cIF: return "cIF";
-    case dummy: case maxLc: return "";
-    }
-    return "";
-  }
-};
-
-} // namespace BNC_PPP
-
-#endif
Index: trunk/BNC/src/ephemeris.cpp
===================================================================
--- trunk/BNC/src/ephemeris.cpp	(revision 6043)
+++ trunk/BNC/src/ephemeris.cpp	(revision 6044)
@@ -12,5 +12,5 @@
 #include "bnccore.h"
 #include "bncutils.h"
-#include "PPP/pppInclude.h"
+#include "pppInclude.h"
 
 using namespace std;
Index: trunk/BNC/src/pppInclude.h
===================================================================
--- trunk/BNC/src/pppInclude.h	(revision 6044)
+++ trunk/BNC/src/pppInclude.h	(revision 6044)
@@ -0,0 +1,198 @@
+#ifndef PPP_H
+#define PPP_H
+
+#include <string>
+#include <vector>
+#include <newmat.h>
+
+#include "bncconst.h"
+#include "bnctime.h"
+#include "t_prn.h"
+
+namespace BNC_PPP {
+
+class t_except {
+ public:
+  t_except(const char* msg) {
+    _msg = msg;
+  }
+  ~t_except() {}
+  std::string what() {return _msg;}
+ private:
+  std::string _msg;
+};
+
+class t_output {
+ public:
+  bncTime      _epoTime;           
+  double       _xyzRover[3];  
+  double       _covMatrix[6]; 
+  double       _neu[3];  
+  int          _numSat;       
+  double       _pDop;         
+  std::string  _log;          
+  bool         _error;        
+};
+
+class t_frqObs  {
+ public:
+  t_frqObs() {
+    _code            = 0.0;          
+    _codeValid       = false;     
+    _phase           = 0.0;         
+    _phaseValid      = false;    
+    _doppler         = 0.0;       
+    _dopplerValid    = false;  
+    _snr             = 0.0;           
+    _snrValid        = false;      
+    _slip            = false;          
+    _slipCounter     = 0;   
+    _biasJumpCounter = 0;
+  }
+  std::string       _rnxType2ch; 
+  double            _code;          
+  bool              _codeValid;     
+  double            _phase;         
+  bool              _phaseValid;    
+  double            _doppler;       
+  bool              _dopplerValid;  
+  double            _snr;           
+  bool              _snrValid;      
+  bool              _slip;          
+  int               _slipCounter;   
+  int               _biasJumpCounter;
+};
+
+class t_satObs {
+ public:
+  t_satObs() {}
+  ~t_satObs() {for (unsigned ii = 0; ii < _obs.size(); ii++) delete _obs[ii];}
+  t_prn                  _prn;
+  bncTime                _time;
+  std::vector<t_frqObs*> _obs;
+};
+
+class t_orbCorr {
+ public:
+  t_prn          prn() const {return _prn;}
+  unsigned short IOD() const {return _iod;}
+  t_prn          _prn;
+  unsigned short _iod;
+  bncTime        _time;
+  char           _system;
+  double         _xr[3];
+  double         _dotXr[3]; 
+};
+
+class t_clkCorr {
+ public:
+  t_prn          prn() const {return _prn;}
+  unsigned short IOD() const {return _iod;}
+  t_prn          _prn;
+  unsigned short _iod;
+  bncTime        _time;
+  double         _dClk;
+  double         _dotDClk;
+  double         _dotDotDClk;
+  double         _clkPartial;
+};
+
+class t_frqBias {
+ public:
+  t_frqBias() {
+    _code       = 0.0;          
+    _codeValid  = false;     
+    _phase      = 0.0;         
+    _phaseValid = false;    
+  }
+  std::string _rnxType2ch;
+  double      _code;          
+  bool        _codeValid;     
+  double      _phase;         
+  bool        _phaseValid;    
+};
+
+class t_satBias {
+ public:
+  t_prn                  _prn;
+  bncTime                _time;
+  int                    _nx;
+  int                    _jumpCount;
+  std::vector<t_frqBias> _bias;
+};
+
+class t_lc {
+ public:
+  enum type {dummy = 0, l1, l2, c1, c2, lIF, cIF, MW, CL, maxLc};
+
+  static bool includesPhase(type tt) {
+    switch (tt) {
+    case l1:
+    case l2:
+    case lIF:
+    case MW:
+    case CL:
+      return true;
+    case c1:
+    case c2:
+    case cIF:
+      return false;
+    case dummy: case maxLc: return false;
+    }
+    return false;
+  }
+
+  static bool includesCode(type tt) {
+    switch (tt) {
+    case c1:
+    case c2:
+    case cIF:
+    case MW:
+    case CL:
+      return true;
+    case l1:
+    case l2:
+    case lIF:
+      return false;
+    case dummy: case maxLc: return false;
+    }
+    return false;
+  }
+
+  static t_frequency::type toFreq(char sys, type tt) {
+    switch (tt) {
+    case l1: case c1:
+      if      (sys == 'G') return t_frequency::G1;
+      else if (sys == 'R') return t_frequency::R1;
+      else if (sys == 'E') return t_frequency::E1;
+      else                 return t_frequency::dummy;
+    case l2: case c2:
+      if      (sys == 'G') return t_frequency::G2;
+      else if (sys == 'R') return t_frequency::R2;
+      else                 return t_frequency::dummy;
+    case lIF: case cIF: case MW: case CL: 
+      return t_frequency::dummy;
+    case dummy: case maxLc: return t_frequency::dummy;
+    }
+    return t_frequency::dummy;
+  }
+
+  static std::string toString(type tt) {
+    switch (tt) {
+    case l1:  return "l1";
+    case l2:  return "l2";
+    case lIF: return "lIF";
+    case MW:  return "MW";
+    case CL:  return "CL";
+    case c1:  return "c1";
+    case c2:  return "c2";
+    case cIF: return "cIF";
+    case dummy: case maxLc: return "";
+    }
+    return "";
+  }
+};
+
+} // namespace BNC_PPP
+
+#endif
Index: trunk/BNC/src/src.pri
===================================================================
--- trunk/BNC/src/src.pri	(revision 6043)
+++ trunk/BNC/src/src.pri	(revision 6044)
@@ -53,5 +53,5 @@
           upload/bncrtnetuploadcaster.h upload/bnccustomtrafo.h       \
           upload/bncephuploadcaster.h qtfilechooser.h                 \
-          GPSDecoder.h pppWidgets.h pppModel.h                        \
+          GPSDecoder.h pppInclude.h pppWidgets.h pppModel.h           \
           RTCM/RTCM2.h RTCM/RTCM2Decoder.h                            \
           RTCM/RTCM2_2021.h RTCM/rtcm_utils.h                         \
@@ -116,5 +116,5 @@
 exists(PPP) {
   DEFINES += USE_PPP
-  HEADERS += PPP/pppInclude.h   PPP/pppOptions.h   PPP/pppMain.h     \
+  HEADERS += PPP/pppOptions.h   PPP/pppMain.h     \
              PPP/pppThread.h    PPP/pppClient.h   \
              PPP/pppObsPool.h   PPP/pppStation.h   PPP/pppFilter.h   \