diff --git a/ccsrc/EncDec/module.mk b/ccsrc/EncDec/module.mk
index f8d0a9f82f5a92c541d0767f0833e347d70d283c..a0b5054a3032140d7ec0018819c07f3daf91e816 100644
--- a/ccsrc/EncDec/module.mk
+++ b/ccsrc/EncDec/module.mk
@@ -8,7 +8,8 @@ sources := \
 #           LibItsPki_Encdec.cc \
 #           LibItsSremSsem_Encdec.cc 
 
-# AtsGeoNetworking does not require LibItsBtp_Encdec.cc
+# AtsGeoNetworking and AtsPki do not require LibItsBtp_Encdec.cc
+
 ifeq (AtsBTP, $(ATS))
 sources += LibItsBtp_Encdec.cc
 endif
@@ -27,6 +28,7 @@ endif
 
 ifeq (AtsRSUsSimulator, $(ATS))
 sources += \
+           LibItsBtp_Encdec.cc  \
            LibItsCam_Encdec.cc  \
            LibItsDenm_Encdec.cc  \
            LibItsHttp_Encdec.cc \
@@ -58,11 +60,7 @@ sources += LibItsRtcmem_Encdec.cc LibItsBtp_Encdec.cc
 endif
 
 ifeq (AtsPki, $(ATS))
-sources := \
-           LibItsBtp_Encdec.cc \
-           LibItsGeoNetworking_Encdec.cc \
-           LibItsIpv6OverGeoNetworking_Encdec.cc \
-           LibItsSecurity_Encdec.cc \
+sources += \
            LibItsPki_Encdec.cc \
            LibItsHttp_Encdec.cc
 endif
diff --git a/ttcn/AtsPki/module.mk b/ttcn/AtsPki/module.mk
index 61479f12f12fe6e38fca665d4809e08e91321afa..77e90475e50b72481fbbd86e9e5ba70814808dcd 100755
--- a/ttcn/AtsPki/module.mk
+++ b/ttcn/AtsPki/module.mk
@@ -1,49 +1,49 @@
-suite := AtsPki
-
-sources := ItsPki_Pixits.ttcn \
-           ItsPki_TestCases.ttcn \
-           ItsPki_TestControl.ttcn
-
-modules :=  ../LibCommon \
-            ../LibIts  \
-            ../LibIts/asn1/CAM \
-            ../LibIts/asn1/DENM \
-            ../LibIts/asn1/IS \
-            ../LibIts/asn1/Security \
-            ../LibIts/ttcn/Security \
-            ../LibIts/ttcn/Pki \
-            ../LibIts/ttcn/Http \
-            ../LibIts/ttcn/GeoNetworking \
-            ../LibIts/ttcn/Ipv6OverGeoNetworking \
-            ../../ccsrc/Ports/LibIts_ports \
-            ../../ccsrc/Ports/LibIts_ports/Http_ports \
-            ../../ccsrc/Ports/LibIts_ports/Pki_ports \
-            ../../ccsrc/Ports/LibIts_ports/GN_ports \
-            ../../ccsrc/Ports/LibIts_ports/IPv6oGN_ports \
-            ../../ccsrc/EncDec \
-            ../../ccsrc/Framework \
-            ../../ccsrc/Externals \
-            ../../ccsrc/loggers \
-            ../../ccsrc/geospacial \
-            ../../ccsrc/Asn1c \
-            ../../ccsrc/Protocols/UpperTester \
-            ../../ccsrc/Protocols/Http \
-            ../../ccsrc/Protocols/Security \
-            ../../ccsrc/Protocols/GeoNetworking \
-            ../modules/titan.TestPorts.HTTPmsg
-
-#            ../LibIts/ttcn/CAM \
-#            ../LibIts/ttcn/DENM \
-#            ../LibIts/ttcn/BTP \
-#            ../../ccsrc/Ports/LibIts_ports/CAM_ports \
-#            ../../ccsrc/Protocols/Pcap \
-#            ../../ccsrc/Protocols/ETH \
-#            ../../ccsrc/Protocols/BTP \
-#            ../../ccsrc/Protocols/CAM \
-#            ../../ccsrc/Protocols/DENM \
-#            ../../ccsrc/Protocols/IVIM \
-#            ../../ccsrc/Protocols/MapemSpatem \
-#            ../../ccsrc/Protocols/SremSsem \
-
-#includes :=  \
-#             ../../ccsrc/Ports/LibIts_ports/BTP_ports
+suite := AtsPki
+
+sources := ItsPki_Pixits.ttcn \
+           ItsPki_TestCases.ttcn \
+           ItsPki_TestControl.ttcn
+
+modules :=  ../LibCommon \
+            ../LibIts  \
+            ../LibIts/asn1/CAM \
+            ../LibIts/asn1/DENM \
+            ../LibIts/asn1/IS \
+            ../LibIts/asn1/Security \
+            ../LibIts/ttcn/Security \
+            ../LibIts/ttcn/Pki \
+            ../LibIts/ttcn/Http \
+            ../LibIts/ttcn/GeoNetworking \
+            ../LibIts/ttcn/Ipv6OverGeoNetworking \
+            ../../ccsrc/Ports/LibIts_ports \
+            ../../ccsrc/Ports/LibIts_ports/Http_ports \
+            ../../ccsrc/Ports/LibIts_ports/Pki_ports \
+            ../../ccsrc/Ports/LibIts_ports/GN_ports \
+            ../../ccsrc/Ports/LibIts_ports/IPv6oGN_ports \
+            ../../ccsrc/EncDec \
+            ../../ccsrc/Framework \
+            ../../ccsrc/Externals \
+            ../../ccsrc/loggers \
+            ../../ccsrc/geospacial \
+            ../../ccsrc/Asn1c \
+            ../../ccsrc/Protocols/UpperTester \
+            ../../ccsrc/Protocols/Http \
+            ../../ccsrc/Protocols/Security \
+            ../../ccsrc/Protocols/GeoNetworking \
+            ../modules/titan.TestPorts.HTTPmsg
+
+#            ../LibIts/ttcn/CAM \
+#            ../LibIts/ttcn/DENM \
+#            ../LibIts/ttcn/BTP \
+#            ../../ccsrc/Ports/LibIts_ports/CAM_ports \
+#            ../../ccsrc/Protocols/Pcap \
+#            ../../ccsrc/Protocols/ETH \
+#            ../../ccsrc/Protocols/BTP \
+#            ../../ccsrc/Protocols/CAM \
+#            ../../ccsrc/Protocols/DENM \
+#            ../../ccsrc/Protocols/IVIM \
+#            ../../ccsrc/Protocols/MapemSpatem \
+#            ../../ccsrc/Protocols/SremSsem \
+
+#includes :=  \
+#             ../../ccsrc/Ports/LibIts_ports/BTP_ports