Index: trunk/BNC/src/RTCM/RTCM2Decoder.h
===================================================================
--- trunk/BNC/src/RTCM/RTCM2Decoder.h	(revision 6138)
+++ trunk/BNC/src/RTCM/RTCM2Decoder.h	(revision 6139)
@@ -33,5 +33,4 @@
 #include "RTCM2.h"
 #include "RTCM2_2021.h"
-#include "rtcm3torinex.h"
 #include "ephemeris.h"
 #include "bncephuser.h"
Index: trunk/BNC/src/RTCM/rtcm_utils.cpp
===================================================================
--- trunk/BNC/src/RTCM/rtcm_utils.cpp	(revision 6138)
+++ trunk/BNC/src/RTCM/rtcm_utils.cpp	(revision 6139)
@@ -3,8 +3,7 @@
 #include <math.h>
 #include <stdio.h>
-#include <rtcm3torinex.h>
-#include <ephemeris.h>
 
 #include "rtcm_utils.h"
+#include "ephemeris.h"
 
 using namespace std;
Index: trunk/BNC/src/RTCM3/ephEncoder.cpp
===================================================================
--- trunk/BNC/src/RTCM3/ephEncoder.cpp	(revision 6138)
+++ trunk/BNC/src/RTCM3/ephEncoder.cpp	(revision 6139)
@@ -1,4 +1,9 @@
 
 #include "ephEncoder.h"
+
+extern "C" {
+#  include "rtcm3torinex.h"
+}
+
 using namespace std;
 
Index: trunk/BNC/src/bncephuser.h
===================================================================
--- trunk/BNC/src/bncephuser.h	(revision 6138)
+++ trunk/BNC/src/bncephuser.h	(revision 6139)
@@ -34,5 +34,5 @@
 
 extern "C" {
-#include "clock_orbit_rtcm.h"
+#  include "clock_orbit_rtcm.h"
 }
 
Index: trunk/BNC/src/bncgetthread.h
===================================================================
--- trunk/BNC/src/bncgetthread.h	(revision 6138)
+++ trunk/BNC/src/bncgetthread.h	(revision 6139)
@@ -31,5 +31,4 @@
 #include <QFile>
 
-#include "rtcm3torinex.h"
 #include "bncconst.h"
 #include "bncnetquery.h"
Index: trunk/BNC/src/bncrinex.cpp
===================================================================
--- trunk/BNC/src/bncrinex.cpp	(revision 6138)
+++ trunk/BNC/src/bncrinex.cpp	(revision 6139)
@@ -59,5 +59,4 @@
 #include "bncsettings.h"
 #include "bncversion.h"
-#include "rtcm3torinex.h"
 
 using namespace std;
Index: trunk/BNC/src/ephemeris.h
===================================================================
--- trunk/BNC/src/ephemeris.h	(revision 6138)
+++ trunk/BNC/src/ephemeris.h	(revision 6139)
@@ -9,6 +9,7 @@
 #include "bncconst.h"
 #include "t_prn.h"
+
 extern "C" {
-#include "rtcm3torinex.h"
+#  include "rtcm3torinex.h"
 }
 
Index: trunk/BNC/src/upload/bncrtnetuploadcaster.cpp
===================================================================
--- trunk/BNC/src/upload/bncrtnetuploadcaster.cpp	(revision 6138)
+++ trunk/BNC/src/upload/bncrtnetuploadcaster.cpp	(revision 6139)
@@ -21,4 +21,8 @@
 #include "bncclockrinex.h"
 #include "bncsp3.h"
+
+extern "C" {
+#  include "rtcm3torinex.h"
+}
 
 using namespace std;