5 files changed, 5 insertions, 3 deletions

diff --git a/linden/indra/llvfs/lldir.cpp b/linden/indra/llvfs/lldir.cpp
index b8a4794..0c93cbb 100644
--- a/linden/indra/llvfs/lldir.cpp
+++ b/linden/indra/llvfs/lldir.cpp
@@ -43,6 +43,7 @@
 #include "lldir.h"
 #include "llerror.h"
 #include "lluuid.h"
+#include "lltimer.h"
 
 #if LL_WINDOWS
 #include "lldir_win32.h"
diff --git a/linden/indra/llvfs/llpidlock.cpp b/linden/indra/llvfs/llpidlock.cpp
index 93ac120..cb64428 100755
--- a/linden/indra/llvfs/llpidlock.cpp
+++ b/linden/indra/llvfs/llpidlock.cpp
@@ -39,6 +39,7 @@
 #include "llsdserialize.h"
 #include "llnametable.h"
 #include "llframetimer.h"
+#include "llapp.h"
 
 #if LL_WINDOWS   //For windows platform.
 bool isProcessAlive(U32 pid)
@@ -60,7 +61,7 @@ class LLPidLockFile
         public:
                 LLPidLockFile( ) :
                         mSaving(FALSE), mWaiting(FALSE), 
-                        mClean(TRUE), mPID(getpid())
+                        mClean(TRUE), mPID(LLApp::getPid())
                 {
                         mLockName = gDirUtilp->getTempDir() + "/savelock";
                 }
diff --git a/linden/indra/llvfs/llpidlock.h b/linden/indra/llvfs/llpidlock.h
index 42aee4d..efcfd91 100755
--- a/linden/indra/llvfs/llpidlock.h
+++ b/linden/indra/llvfs/llpidlock.h
@@ -41,8 +41,6 @@ class LLFrameTimer;
 
 #include <windows.h>
 
-#define getpid GetCurrentProcessId
-
 #else   //Everyone Else
 
 #include <signal.h>
diff --git a/linden/indra/llvfs/llvfile.cpp b/linden/indra/llvfs/llvfile.cpp
index 6b1563b..630975a 100644
--- a/linden/indra/llvfs/llvfile.cpp
+++ b/linden/indra/llvfs/llvfile.cpp
@@ -38,6 +38,7 @@
 #include "llthread.h"
 #include "llstat.h"
 #include "llvfs.h"
+#include "llfasttimer.h"
 
 const S32 LLVFile::READ                 = 0x00000001;
 const S32 LLVFile::WRITE                = 0x00000002;
diff --git a/linden/indra/llvfs/llvfs.cpp b/linden/indra/llvfs/llvfs.cpp
index 9bf5b59..dea8c9c 100644
--- a/linden/indra/llvfs/llvfs.cpp
+++ b/linden/indra/llvfs/llvfs.cpp
@@ -47,6 +47,7 @@
     
 #include "llvfs.h"
 #include "llstl.h"
+#include "lltimer.h"
     
 const S32 FILE_BLOCK_MASK = 0x000003FF;  // 1024-byte blocks
 const S32 VFS_CLEANUP_SIZE = 5242880;  // how much space we free up in a single stroke