diff --git a/RealVector.hpp b/RealVector.hpp
index 3af04d5..327463f 100755
--- a/RealVector.hpp
+++ b/RealVector.hpp
@@ -190,7 +190,7 @@ private:
 	radio_float_t *m_pBufReal;
 	radio_float_t *m_pPtrReal;
 
-	_inline void checkSize(uint32_t size1, uint32_t size2)
+	inline void checkSize(uint32_t size1, uint32_t size2)
 	{
 		try
 		{
@@ -231,4 +231,4 @@ RealVector::OpBinary<RealVector::Sub> operator-(const RealVector &a, const RealV
 RealVector::OpBinary<RealVector::Mul> operator*(const RealVector &a, const RealVector &b);
 RealVector::OpBinary<RealVector::Div> operator/(const RealVector &a, const RealVector &b);
 
-#endif // _REAL_HPP_
\ No newline at end of file
+#endif // _REAL_HPP_
diff --git a/interpolation.h b/interpolation.h
index cd21eaf..c80eea7 100755
--- a/interpolation.h
+++ b/interpolation.h
@@ -23,8 +23,8 @@ typedef struct _fir_cpx_t
 	uint32_t N, r, w;
 	cpx_t *pX;
 	uint32_t M_up, M_down;
-	clock_t clockUp;
-	clock_t clockDown;
+	sample_clock_t clockUp;
+	sample_clock_t clockDown;
 } fir_cpx_t;
 
 typedef struct _fir_cpx_multirate_stage_t
diff --git a/statistics.c b/statistics.c
index 738cf38..926b1ee 100755
--- a/statistics.c
+++ b/statistics.c
@@ -220,7 +220,7 @@ void SlidingMinMaxProcessV(sl_minmax_t *pObj, radio_float_t *pX, uint32_t len)
 }
 	
 // --------------------------------------------------------------
-void TraceOpen(trace_t *pObj, char *pFilename)
+void TraceOpen(trace_t *pObj, const char *pFilename)
 {
 	pObj->pFile = fopen(pFilename, "w");
 }
@@ -231,7 +231,7 @@ void TraceClose(trace_t *pObj)
 		fclose(pObj->pFile);
 }
 
-void TracePrint(trace_t *pObj, char *fmt, ... )
+void TracePrint(trace_t *pObj, const char *fmt, ... )
 {
 
     va_list a_list;
diff --git a/statistics.h b/statistics.h
index 29fc290..a625d18 100755
--- a/statistics.h
+++ b/statistics.h
@@ -81,9 +81,9 @@ typedef struct _trace_t
 	FILE *pFile;
 } trace_t;
 
-void TraceOpen(trace_t *pObj, char *pFilename);
+void TraceOpen(trace_t *pObj, const char *pFilename);
 void TraceClose(trace_t *pObj);
-void TracePrint(trace_t *pObj, char *fmt, ... );
+void TracePrint(trace_t *pObj, const char *fmt, ... );
 
 // --------------------------------------------------------------
 #ifdef __cplusplus
diff --git a/synchronization.c b/synchronization.c
index 970089a..61ec962 100755
--- a/synchronization.c
+++ b/synchronization.c
@@ -6,7 +6,7 @@
 // --------------------------------------------------------------
 // Clock generator
 // --------------------------------------------------------------
-void ClockInit(clock_t *pObj, uint32_t divide)
+void ClockInit(sample_clock_t *pObj, uint32_t divide)
 {
 	if (divide == 0)
 		divide = 1;
@@ -15,7 +15,7 @@ void ClockInit(clock_t *pObj, uint32_t divide)
 	pObj->count = (int32_t)divide;
 }
 
-uint32_t ClockIsTick(clock_t *pObj, uint32_t do_advance)
+uint32_t ClockIsTick(sample_clock_t *pObj, uint32_t do_advance)
 {
 	uint32_t isTick;
 
@@ -32,7 +32,7 @@ uint32_t ClockIsTick(clock_t *pObj, uint32_t do_advance)
 	return isTick;
 }
 
-void ClockAdvance(clock_t *pObj)
+void ClockAdvance(sample_clock_t *pObj)
 {
 	if (pObj->count == 0)
 	{
@@ -41,7 +41,7 @@ void ClockAdvance(clock_t *pObj)
 	pObj->count--;
 }
 
-void ClockSetPhase(clock_t *pObj, int32_t phase)
+void ClockSetPhase(sample_clock_t *pObj, int32_t phase)
 {
 	pObj->count = pObj->count - phase;
 	if (pObj->count <= 0)
diff --git a/synchronization.h b/synchronization.h
index 1aa9319..d7164bd 100755
--- a/synchronization.h
+++ b/synchronization.h
@@ -9,12 +9,12 @@
 // --------------------------------------------------------------
 // Types
 // --------------------------------------------------------------
-typedef struct _clock_t
+typedef struct _sample_clock_t
 {
 	uint32_t reload;
 	int32_t count;
 
-} clock_t;
+} sample_clock_t;
 
 typedef struct _lead_lag_filter_t
 {
@@ -59,10 +59,10 @@ typedef struct _timing_corrector_t
 extern "C" {
 #endif
 
-void ClockInit(clock_t *pObj, uint32_t divide);
-uint32_t ClockIsTick(clock_t *pObj, uint32_t do_advance);
-void ClockAdvance(clock_t *pObj);
-void ClockSetPhase(clock_t *pObj, int32_t phase);
+void ClockInit(sample_clock_t *pObj, uint32_t divide);
+uint32_t ClockIsTick(sample_clock_t *pObj, uint32_t do_advance);
+void ClockAdvance(sample_clock_t *pObj);
+void ClockSetPhase(sample_clock_t *pObj, int32_t phase);
 
 void STRGardnerInit(str_t *pObj);
 radio_float_t STRGardnerProcess(str_t *pObj, cpx_t x);