diff --git a/flaim/src/fbuff.h b/flaim/src/fbuff.h
index b76816d..f858c51 100644
--- a/flaim/src/fbuff.h
+++ b/flaim/src/fbuff.h
@@ -220,7 +220,7 @@ public:
 	}
 #endif
 
-#if defined( FLM_LINUX) || defined( FLM_SOLARIS) || defined( FLM_OSX)
+#if defined( FLM_UNIX)
 	FINLINE struct aiocb * getAIOStruct( void)
 	{
 		return( &m_aio);
@@ -260,7 +260,7 @@ private:
 	HANDLE					m_FileHandle;
 	OVERLAPPED				m_Overlapped;
 #endif
-#if defined( FLM_LINUX) || defined( FLM_SOLARIS) || defined( FLM_OSX)
+#if defined( FLM_UNIX)
 	struct aiocb			m_aio;
 #endif
 #ifdef FLM_NLM
diff --git a/flaim/src/fldbglog.cpp b/flaim/src/fldbglog.cpp
index efadbb9..62c8556 100644
--- a/flaim/src/fldbglog.cpp
+++ b/flaim/src/fldbglog.cpp
@@ -342,15 +342,13 @@ void _flmDbgOutputMsg(
 	}
 }
 
-#else
+#endif	// #ifdef FLM_DBG_LOG
 
-// Must have something here for the Netware platform, or it won't build.
-
-#if defined( FLM_NLM) && !defined( __MWERKS__)
+/****************************************************************************
+Desc:
+****************************************************************************/
+#if( (defined( FLM_NLM) && !defined( __MWERKS__)) || defined( FLM_OSX))
 void gv_fldbglog()
 {
 }
 #endif
-
-
-#endif	// #ifdef FLM_DBG_LOG
diff --git a/flaim/src/fnlm.cpp b/flaim/src/fnlm.cpp
index 64cc203..316b784 100644
--- a/flaim/src/fnlm.cpp
+++ b/flaim/src/fnlm.cpp
@@ -3935,3 +3935,12 @@ FSTATIC void ConvertToQualifiedNWPath(
 }
 
 #endif
+
+/****************************************************************************
+Desc:
+****************************************************************************/
+#if defined( FLM_OSX)
+void gv_fnlm()
+{
+}
+#endif
diff --git a/flaim/src/fposix.cpp b/flaim/src/fposix.cpp
index e9da0a5..0c3b446 100644
--- a/flaim/src/fposix.cpp
+++ b/flaim/src/fposix.cpp
@@ -217,7 +217,7 @@ RCODE F_FileHdlImp::OpenOrCreate(
 				{
 					bDoDirectIO = FALSE;
 				}
-#elif defined( FLM_SOLARIS)
+#else
 				if( gv_FlmSysData.bOkToDoAsyncWrites)
 				{
 					m_bCanDoAsync = TRUE;
diff --git a/flaim/src/ftk.h b/flaim/src/ftk.h
index 292091c..b531c4a 100644
--- a/flaim/src/ftk.h
+++ b/flaim/src/ftk.h
@@ -177,6 +177,7 @@
 		#include <sys/socket.h>
 		#include <sys/stat.h>
 		#include <sys/time.h>
+		#include <aio.h>
 		
 		#ifndef  _POSIX_THREADS
 			#define  _POSIX_THREADS
@@ -192,10 +193,6 @@
 			#include <sys/atomic_op.h>
 		#endif
 		
-		#ifndef FLM_OSX
-			#include <aio.h>
-		#endif
-	
 		#define FSTATIC		static
 	
 		#define f_stricmp(str1,str2) \
diff --git a/flaim/src/ftkmod.cpp b/flaim/src/ftkmod.cpp
index 4dfdfc9..64fcef7 100644
--- a/flaim/src/ftkmod.cpp
+++ b/flaim/src/ftkmod.cpp
@@ -373,3 +373,12 @@ Exit:
 }
 
 #endif
+
+/****************************************************************************
+Desc:
+****************************************************************************/
+#if defined( FLM_OSX)
+void gv_fnlm()
+{
+}
+#endif
diff --git a/flaim/src/nlmload.cpp b/flaim/src/nlmload.cpp
index ed57ae4..55c1bc9 100644
--- a/flaim/src/nlmload.cpp
+++ b/flaim/src/nlmload.cpp
@@ -431,3 +431,12 @@ int atexit(
 }
 
 #endif // FLM_WATCOM_NLM
+
+/****************************************************************************
+Desc:
+****************************************************************************/
+#if defined( FLM_OSX)
+void gv_nlmload()
+{
+}
+#endif
diff --git a/flaim/src/nwyield.cpp b/flaim/src/nwyield.cpp
index 827cf31..183cb88 100644
--- a/flaim/src/nwyield.cpp
+++ b/flaim/src/nwyield.cpp
@@ -247,3 +247,12 @@ void NWYieldIfTime(void)
 }
 
 #endif	// FLM_NLM
+
+/****************************************************************************
+Desc:
+****************************************************************************/
+#if defined( FLM_OSX)
+void gv_nwyield()
+{
+}
+#endif