diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a734ff..aae5e34 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,7 +52,7 @@ set(DSS_SOURCE_FILES
         APICommonCode/QTSSRollingLog.cpp
         APICommonCode/SDPSourceInfo.cpp
         APICommonCode/SourceInfo.cpp
-        APIModules/OSMemory_Modules/OSMemory_Modules.cpp
+#        APIModules/OSMemory_Modules/OSMemory_Modules.cpp
         APIModules/QTSSAccessLogModule/QTSSAccessLogModule.cpp
         APIModules/QTSSAccessModule/AccessChecker.cpp
         APIModules/QTSSAccessModule/QTSSAccessModule.cpp
@@ -177,7 +177,6 @@ set(DSS_SOURCE_FILES
         QTFileLib/QTHintTrack.cpp
         QTFileLib/QTRTPFile.cpp
         QTFileLib/QTTrack.cpp
-        qtpasswd.tproj/QTSSPasswd.cpp
         RTCPUtilitiesLib/RTCPAckPacket.cpp
         RTCPUtilitiesLib/RTCPAPPNADUPacket.cpp
         RTCPUtilitiesLib/RTCPAPPPacket.cpp
@@ -225,12 +224,7 @@ set(DSS_SOURCE_FILES
         Server.tproj/RTSPSession.cpp
         Server.tproj/RTSPSession3GPP.cpp
         Server.tproj/RTSPSessionInterface.cpp
-        Server.tproj/RunServer.cpp
-        StreamingProxy.tproj/get_opt.c
-        StreamingProxy.tproj/proxy.c
-        StreamingProxy.tproj/proxy_unix.c
-        StreamingProxy.tproj/shared_udp.c
-        StreamingProxy.tproj/util.c)
+        Server.tproj/RunServer.cpp)
 
 add_executable(DarwinStreamingServer ${DSS_SOURCE_FILES})
 target_link_libraries(DarwinStreamingServer pthread crypt dl m stdc++)
@@ -467,4 +461,23 @@ target_link_libraries(QTTrackInfo pthread)
 add_executable(RTPFileGen ${QTFILELIB_COMMON_SOURCE_FILES}
         QTFileLib/QTRTPFile.cpp
         QTFileTools/RTPFileGen.tproj/RTPFileGen.cpp)
-target_link_libraries(RTPFileGen pthread)
\ No newline at end of file
+target_link_libraries(RTPFileGen pthread)
+
+add_executable(qtpasswd
+        SafeStdLib/InternalStdLib.cpp
+        CommonUtilitiesLib/md5.c
+        CommonUtilitiesLib/md5digest.cpp
+        CommonUtilitiesLib/OS.cpp
+        CommonUtilitiesLib/OSMutex.cpp
+        CommonUtilitiesLib/MyAssert.cpp
+        CommonUtilitiesLib/StringParser.cpp
+        CommonUtilitiesLib/StrPtrLen.cpp
+        qtpasswd.tproj/QTSSPasswd.cpp)
+target_link_libraries(qtpasswd pthread crypt)
+
+add_executable(StreamingProxy
+        StreamingProxy.tproj/get_opt.c
+        StreamingProxy.tproj/proxy.c
+        StreamingProxy.tproj/proxy_unix.c
+        StreamingProxy.tproj/shared_udp.c
+        StreamingProxy.tproj/util.c)
\ No newline at end of file