diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp
index bdc8affe..d030a486 100644
--- a/Transceiver52M/Transceiver.cpp
+++ b/Transceiver52M/Transceiver.cpp
@@ -36,6 +36,8 @@
 #include "config.h"
 #endif
 
+using namespace GSM;
+
 #define USB_LATENCY_INTRVL		10,0
 
 #if USE_UHD
diff --git a/Transceiver52M/radioInterface.h b/Transceiver52M/radioInterface.h
index cac20de2..6e15a1fa 100644
--- a/Transceiver52M/radioInterface.h
+++ b/Transceiver52M/radioInterface.h
@@ -26,6 +26,8 @@
 #define INCHUNK    (625)
 #define OUTCHUNK   (625)
 
+static const unsigned gSlotLen = 148;      ///< number of symbols per slot, not counting guard periods
+
 /** class to interface the transceiver with the USRP */
 class RadioInterface {
 
diff --git a/Transceiver52M/radioVector.h b/Transceiver52M/radioVector.h
index 2975a730..8de4493c 100644
--- a/Transceiver52M/radioVector.h
+++ b/Transceiver52M/radioVector.h
@@ -24,6 +24,7 @@
 
 #include "sigProcLib.h"
 #include "GSMCommon.h"
+#include "Interthread.h"
 
 class radioVector : public signalVector {
 public:
diff --git a/Transceiver52M/sigProcLib.cpp b/Transceiver52M/sigProcLib.cpp
index 5dc2def8..cf72cae7 100644
--- a/Transceiver52M/sigProcLib.cpp
+++ b/Transceiver52M/sigProcLib.cpp
@@ -33,6 +33,8 @@
 
 #include <Logger.h>
 
+using namespace GSM;
+
 #define TABLESIZE 1024
 
 /** Lookup tables for trigonometric approximation */
diff --git a/Transceiver52M/sigProcLib.h b/Transceiver52M/sigProcLib.h
index 3aaa62bf..8e8c48fb 100644
--- a/Transceiver52M/sigProcLib.h
+++ b/Transceiver52M/sigProcLib.h
@@ -17,10 +17,7 @@
 
 #include "Vector.h"
 #include "Complex.h"
-#include "GSMTransfer.h"
-
-
-using namespace GSM;
+#include "BitVector.h"
 
 /** Indicated signalVector symmetry */
 enum Symmetry {
diff --git a/Transceiver52M/sigProcLibTest.cpp b/Transceiver52M/sigProcLibTest.cpp
index 1c2a1af0..4f927176 100644
--- a/Transceiver52M/sigProcLibTest.cpp
+++ b/Transceiver52M/sigProcLibTest.cpp
@@ -33,8 +33,10 @@ Harvind S. Samra, hssamra@kestrelsp.com
 //#include "radioInterface.h"
 #include <Logger.h>
 #include <Configuration.h>
+#include <GSMCommon.h>
 
 using namespace std;
+using namespace GSM;
 
 ConfigurationTable gConfig;