Fix cyclic headers dependency

src/gtests_functions.cpp

@@ -5,6 +5,7 @@
 #include <gtest/gtest.h>
 
 #include "sphinxint.h"
+#include "sphinxutils.h"
 #include "json/cJSON.h"
 #include <math.h>
 

src/gtests_rtstuff.cpp

@@ -5,6 +5,7 @@
 #include <gtest/gtest.h>
 
 #include "sphinxint.h"
+#include "sphinxrt.h"
 
 #include <gmock/gmock.h>
 

src/gtests_text.cpp

@@ -5,6 +5,8 @@
 #include <gtest/gtest.h>
 
 #include "sphinxint.h"
+#include "sphinxutils.h"
+#include "sphinxstem.h"
 
 
 // Miscelaneous tests mostly processing texts with many test cases: HTML Stripper, levenstein,

src/searchdaemon.h

@@ -107,6 +107,7 @@
 // declarations for correct work of code analysis
 #include "sphinxutils.h"
 #include "sphinxint.h"
+#include "sphinxrt.h"
 
 const char * sphSockError ( int =0 );
 int sphSockGetErrno ();

src/sphinxaot.cpp

@@ -16,6 +16,7 @@
 #include "sphinx.h"
 #include "sphinxint.h"
 #include "sphinxutils.h"
+#include "sphinxstem.h"
 
 //////////////////////////////////////////////////////////////////////////
 // LEMMATIZER

src/sphinxexcerpt.cpp

@@ -19,6 +19,7 @@
 #include "sphinxsearch.h"
 #include "sphinxquery.h"
 #include "sphinxint.h"
+#include "sphinxstem.h"
 
 #include <math.h>
 

src/sphinxfilter.cpp

@@ -13,6 +13,7 @@
 #include "sphinxfilter.h"
 #include "sphinxint.h"
 #include "sphinxjson.h"
+#include "sphinxutils.h"
 
 #if USE_WINDOWS
 #pragma warning(disable:4250) // inheritance via dominance is our intent

src/sphinxint.h

@@ -15,7 +15,6 @@
 
 #include "sphinx.h"
 #include "sphinxfilter.h"
-#include "sphinxrt.h"
 #include "sphinxquery.h"
 #include "sphinxexcerpt.h"
 #include "sphinxudf.h"
@@ -1779,6 +1778,7 @@ void			SaveFieldFilterSettings ( CSphWriter & tWriter, const ISphFieldFilter * p
 bool			AddFieldLens ( CSphSchema & tSchema, bool bDynamic, CSphString & sError );
 
 /// Get current thread local index - internal do not use
+class ISphRtIndex;
 ISphRtIndex * sphGetCurrentIndexRT();
 
 void			RebalanceWeights ( const CSphFixedVector<int64_t> & dTimers, CSphFixedVector<float>& pWeights );

src/sphinxplugin.cpp

@@ -12,6 +12,7 @@
 
 #include "sphinx.h"
 #include "sphinxint.h"
+#include "sphinxutils.h"
 #include "sphinxplugin.h"
 
 #if !USE_WINDOWS

src/sphinxrlp.h

@@ -14,6 +14,7 @@
 #define _sphinxrlp_
 
 #include "sphinxstd.h"
+#include "sphinxutils.h"
 
 //////////////////////////////////////////////////////////////////////////
 

src/sphinxrt.h

@@ -16,6 +16,7 @@
 #include "sphinx.h"
 #include "sphinxutils.h"
 #include "sphinxstem.h"
+#include "sphinxint.h"
 
 struct CSphReconfigureSettings;
 struct CSphReconfigureSetup;

src/sphinxsort.cpp

@@ -13,6 +13,7 @@
 #include "sphinx.h"
 #include "sphinxint.h"
 #include "sphinxjson.h"
+#include "sphinxutils.h"
 
 #include <time.h>
 #include <math.h>

src/sphinxutils.cpp

@@ -18,6 +18,7 @@
 #include "sphinxint.h"
 #include "sphinxplugin.h"
 #include "sphinxrlp.h"
+#include "sphinxstem.h"
 
 #include <ctype.h>
 #include <fcntl.h>