diff --git a/ftk/src/ftkmem.cpp b/ftk/src/ftkmem.cpp
index 4d78830..749b276 100644
--- a/ftk/src/ftkmem.cpp
+++ b/ftk/src/ftkmem.cpp
@@ -4474,7 +4474,7 @@ RCODE f_getMemoryInfo(
 				
 		#elif defined( FLM_LINUX)
 		
-				flmGetLinuxMemInfo( &ui64TotalPhysMem, &ui64AvailPhysMem);
+				f_getLinuxMemInfo( &ui64TotalPhysMem, &ui64AvailPhysMem);
 		
 		#elif defined( _SC_PAGESIZE) && defined( _SC_AVPHYS_PAGES)
 
diff --git a/ftk/src/ftkmisc.cpp b/ftk/src/ftkmisc.cpp
index b316b88..1cc2728 100644
--- a/ftk/src/ftkmisc.cpp
+++ b/ftk/src/ftkmisc.cpp
@@ -96,9 +96,9 @@ RCODE FLMAPI ftkStartup( void)
 	}
 	
 #if defined( FLM_LINUX)
-	flmGetLinuxKernelVersion( &gv_uiLinuxMajorVer, &gv_uiLinuxMinorVer, 
+	f_getLinuxKernelVersion( &gv_uiLinuxMajorVer, &gv_uiLinuxMinorVer, 
 		&gv_uiLinuxRevision);
-	gv_ui64MaxFileSize = flmGetLinuxMaxFileSize();
+	gv_uiMaxFileSize = f_getLinuxMaxFileSize();
 #elif defined( FLM_AIX)
 
 	// Call set setrlimit to increase the max allowed file size.
@@ -1004,6 +1004,32 @@ FLMINT FLMAPI F_Object::Release( void)
 	return( iRefCnt);
 }
 
+/***************************************************************************
+Desc:	Determines if the linux system we are running on is 2.4 or greater.
+***************************************************************************/
+#ifdef FLM_LINUX
+FLMUINT f_getLinuxMaxFileSize( void)
+{
+#ifdef FLM_32BIT
+	return( FLM_MAXIMUM_FILE_SIZE);
+#else
+	FLMUINT	uiMaxFileSize = 0x7FF00000;
+	
+	f_assert( gv_uiLinuxMajorVer);
+	
+	// Is version 2.4 or greater?
+
+	if( gv_uiLinuxMajorVer > 2 || 
+		(gv_uiLinuxMajorVer == 2 && gv_uiLinuxMinorVer >= 4))
+	{
+		uiMaxFileSize = FLM_MAXIMUM_FILE_SIZE;
+	}
+	
+	return( uiMaxFileSize);
+#endif
+}
+#endif
+
 /**********************************************************************
 Desc:
 **********************************************************************/
diff --git a/ftk/src/ftkunix.cpp b/ftk/src/ftkunix.cpp
index db569bb..3fe518a 100644
--- a/ftk/src/ftkunix.cpp
+++ b/ftk/src/ftkunix.cpp
@@ -45,10 +45,6 @@
 	#include <sys/statvfs.h>
 #elif defined( FLM_LINUX)
 	#include <sys/vfs.h>
-
-	extern FLMUINT		gv_uiLinuxMajorVer;
-	extern FLMUINT		gv_uiLinuxMinorVer;
-	extern FLMUINT		gv_uiLinuxRevision;
 #elif defined( FLM_OSF)
 
 	// Tru64 4.0 does not have this declaration. Tru64 5.0 renames statfs
@@ -195,10 +191,12 @@ RCODE F_FileHdl::openOrCreate(
 			else
 			{
 #if defined( FLM_LINUX)
-				FLMUINT		uiMajor = gv_uiLinuxMajorVer;
-				FLMUINT		uiMinor = gv_uiLinuxMinorVer;
-				FLMUINT		uiRevision = gv_uiLinuxRevision;
-																																														
+				FLMUINT		uiMajor;
+				FLMUINT		uiMinor;
+				FLMUINT		uiRevision;
+
+				f_getLinuxKernelVersion( &uiMajor, &uiMinor, &uiRevision);
+
 				if( uiMajor > 2 || (uiMajor == 2 && uiMinor > 6) ||
 					(uiMajor == 2 && uiMinor == 6 && uiRevision >= 5))
 				{
@@ -1383,32 +1381,6 @@ Exit:
 }
 #endif
 
-/***************************************************************************
-Desc:	Determines if the linux system we are running on is 2.4 or greater.
-***************************************************************************/
-#ifdef FLM_LINUX
-FLMUINT f_getLinuxMaxFileSize( void)
-{
-#ifdef FLM_32BIT
-	return( FLM_MAXIMUM_FILE_SIZE);
-#else
-	FLMUINT	uiMaxFileSize = 0x7FF00000;
-	
-	f_assert( gv_uiLinuxMajorVer);
-	
-	// Is version 2.4 or greater?
-
-	if( gv_uiLinuxMajorVer > 2 || 
-		(gv_uiLinuxMajorVer == 2 && gv_uiLinuxMinorVer >= 4))
-	{
-		uiMaxFileSize = FLM_MAXIMUM_FILE_SIZE;
-	}
-	
-	return( uiMaxFileSize);
-#endif
-}
-#endif
-
 /***************************************************************************
 Desc:
 ***************************************************************************/