diff --git a/Sources/Tests/FeatureTests/pfPythonTest/CMakeLists.txt b/Sources/Tests/FeatureTests/pfPythonTest/CMakeLists.txt
index 817cf540..72cce8cc 100644
--- a/Sources/Tests/FeatureTests/pfPythonTest/CMakeLists.txt
+++ b/Sources/Tests/FeatureTests/pfPythonTest/CMakeLists.txt
@@ -2,8 +2,11 @@ include_directories(${GTEST_INCLUDE_DIR})
 include_directories(${gtest_SOURCE_DIR}/include ${gtest_SOURCE_DIR})
 include_directories(../../../Plasma/CoreLib)
 include_directories(../../../Plasma/NucleusLib)
+include_directories(../../../Plasma/NucleusLib/inc)
 include_directories(../../../Plasma/PubUtilLib)
+include_directories(../../../Plasma/PubUtilLib/inc)
 include_directories(../../../Plasma/FeatureLib)
+include_directories(../../../Plasma/FeatureLib/inc)
 
 set(pfPythonTest_SOURCES
     test_cyMisc.cpp
@@ -11,7 +14,85 @@ set(pfPythonTest_SOURCES
 
 add_executable(test_pfPython ${pfPythonTest_SOURCES})
 target_link_libraries(test_pfPython gtest gtest_main)
+
+target_link_libraries(test_pfPython CoreLib)
+target_link_libraries(test_pfPython pfAnimation)
+target_link_libraries(test_pfPython pfAudio)
+target_link_libraries(test_pfPython pfCamera)
+target_link_libraries(test_pfPython pfCCR)
+target_link_libraries(test_pfPython pfCharacter)
+target_link_libraries(test_pfPython pfConditional)
+target_link_libraries(test_pfPython pfConsole)
+target_link_libraries(test_pfPython pfConsoleCore)
+target_link_libraries(test_pfPython pfGameGUIMgr)
+target_link_libraries(test_pfPython pfGameMgr)
+target_link_libraries(test_pfPython pfGameScoreMgr)
+target_link_libraries(test_pfPython pfJournalBook)
+target_link_libraries(test_pfPython pfLocalizationMgr)
+target_link_libraries(test_pfPython pfMessage)
 target_link_libraries(test_pfPython pfPython)
+target_link_libraries(test_pfPython pfSurface)
+target_link_libraries(test_pfPython plAgeDescription)
+target_link_libraries(test_pfPython plAgeLoader)
+target_link_libraries(test_pfPython plAudible)
+target_link_libraries(test_pfPython plAudio)
+target_link_libraries(test_pfPython plAudioCore)
+target_link_libraries(test_pfPython plAvatar)
+target_link_libraries(test_pfPython plClientResMgr)
+target_link_libraries(test_pfPython plClipboard)
+target_link_libraries(test_pfPython plCompression)
+target_link_libraries(test_pfPython plContainer)
+target_link_libraries(test_pfPython plDrawable)
+target_link_libraries(test_pfPython plFile)
+target_link_libraries(test_pfPython plGImage)
+target_link_libraries(test_pfPython plGLight)
+target_link_libraries(test_pfPython plInputCore)
+target_link_libraries(test_pfPython plInterp)
+target_link_libraries(test_pfPython plIntersect)
+target_link_libraries(test_pfPython plMath)
+target_link_libraries(test_pfPython plMessage)
+target_link_libraries(test_pfPython plModifier)
+target_link_libraries(test_pfPython plNetClient)
+target_link_libraries(test_pfPython plNetClientComm)
+target_link_libraries(test_pfPython plNetClientRecorder)
+target_link_libraries(test_pfPython plNetCommon)
+target_link_libraries(test_pfPython plNetGameLib)
+target_link_libraries(test_pfPython plNetMessage)
+target_link_libraries(test_pfPython plNetTransport)
+target_link_libraries(test_pfPython plParticleSystem)
+target_link_libraries(test_pfPython plPhysical)
+target_link_libraries(test_pfPython plPhysX)
+target_link_libraries(test_pfPython plPipeline)
+target_link_libraries(test_pfPython plProgressMgr)
+target_link_libraries(test_pfPython plResMgr)
+target_link_libraries(test_pfPython plScene)
+target_link_libraries(test_pfPython plSDL)
+target_link_libraries(test_pfPython plStatGather)
+target_link_libraries(test_pfPython plStatusLog)
+target_link_libraries(test_pfPython plStreamLogger)
+target_link_libraries(test_pfPython plSurface)
+target_link_libraries(test_pfPython plTransform)
+target_link_libraries(test_pfPython plUnifiedTime)
+target_link_libraries(test_pfPython plVault)
+target_link_libraries(test_pfPython pnAsyncCore)
+target_link_libraries(test_pfPython pnAsyncCoreExe)
+target_link_libraries(test_pfPython pnDispatch)
+target_link_libraries(test_pfPython pnEncryption)
+target_link_libraries(test_pfPython pnFactory)
+target_link_libraries(test_pfPython pnGameMgr)
+target_link_libraries(test_pfPython pnInputCore)
+target_link_libraries(test_pfPython pnKeyedObject)
+target_link_libraries(test_pfPython pnMessage)
+target_link_libraries(test_pfPython pnModifier)
+target_link_libraries(test_pfPython pnNetBase)
+target_link_libraries(test_pfPython pnNetCli)
+target_link_libraries(test_pfPython pnNetCommon)
+target_link_libraries(test_pfPython pnNetProtocol)
+target_link_libraries(test_pfPython pnNucleusInc)
+target_link_libraries(test_pfPython pnSceneObject)
+target_link_libraries(test_pfPython pnTimer)
+target_link_libraries(test_pfPython pnUtils)
+target_link_libraries(test_pfPython pnUUID)
 
 if(PYTHON_DEBUG_LIBRARY)
     target_link_libraries(test_pfPython debug ${PYTHON_DEBUG_LIBRARY})
@@ -20,5 +101,26 @@ else()
     target_link_libraries(test_pfPython ${PYTHON_LIBRARY})
 endif()
 
+target_link_libraries(test_pfPython ${OPENAL_LIBRARY})
+target_link_libraries(test_pfPython ${OPENSSL_LIBRARIES})
+target_link_libraries(test_pfPython ${EXPAT_LIBRARY})
+target_link_libraries(test_pfPython ${JPEG_LIBRARY})
+target_link_libraries(test_pfPython ${PNG_LIBRARY})
+target_link_libraries(test_pfPython ${Speex_LIBRARY})
+target_link_libraries(test_pfPython ${PHYSX_LIBRARIES})
+target_link_libraries(test_pfPython ${Ogg_LIBRARIES})
+target_link_libraries(test_pfPython ${Vorbis_LIBRARIES})
+target_link_libraries(test_pfPython ${DirectX_LIBRARIES})
+target_link_libraries(test_pfPython ${CURL_LIBRARY})
+
+if (WIN32)
+    target_link_libraries(test_pfPython Rpcrt4)
+    target_link_libraries(test_pfPython Version)
+    target_link_libraries(test_pfPython Vfw32)
+    target_link_libraries(test_pfPython Ws2_32)
+    target_link_libraries(test_pfPython winmm)
+    target_link_libraries(test_pfPython strmiids)
+endif(WIN32)
+
 add_test(NAME test_pfPython COMMAND test_pfPython)
 add_dependencies(check test_pfPython)
diff --git a/Sources/Tests/FeatureTests/pfPythonTest/test_cyMisc.cpp b/Sources/Tests/FeatureTests/pfPythonTest/test_cyMisc.cpp
index 323f8400..11f9a28b 100644
--- a/Sources/Tests/FeatureTests/pfPythonTest/test_cyMisc.cpp
+++ b/Sources/Tests/FeatureTests/pfPythonTest/test_cyMisc.cpp
@@ -43,6 +43,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include <iomanip>
 #include <gtest/gtest.h>
 
+#include "pnAllCreatables.h"
+#include "plAllCreatables.h"
+#include "pfAllCreatables.h"
+
 #include "pfPython/cyMisc.h"
 
 // from zoneinfo/America/Denver version 2011g