diff --git a/flaim/src/fcs_tcp.cpp b/flaim/src/fcs_tcp.cpp
index 21f3bbb..0d2bf0f 100644
--- a/flaim/src/fcs_tcp.cpp
+++ b/flaim/src/fcs_tcp.cpp
@@ -694,7 +694,7 @@ RCODE FCS_TCP_CLIENT::openConnection(
 	for( iTries = 0; iTries < iMaxTries; iTries++ )
 	{			
 		iSockErr = 0;
-		if( connect( m_iSocket, (struct sockaddr *)&address,
+		if( connect( m_iSocket, (struct sockaddr *)(void *)&address,
 			(unsigned)sizeof(struct sockaddr)) >= 0)
 		{
 			/* SUCCESS! */
@@ -858,7 +858,7 @@ RCODE	FCS_TCP_SERVER::bind(
 
 	// Bind to the address+port
 
-	if( ::bind( m_iSocket, (struct sockaddr *)&address, 
+	if( ::bind( m_iSocket, (struct sockaddr *)(void *)&address, 
 		(unsigned)sizeof( address)) != 0)
 	{
 		rc = RC_SET( FERR_SVR_BIND_FAIL);
@@ -942,7 +942,7 @@ RCODE FCS_TCP_SERVER::connectClient(
 
 	iAddrLen = (int)sizeof( struct sockaddr);
 	if( (iSocket = accept( m_iSocket, 
-		(struct sockaddr *)&address, &iAddrLen)) == INVALID_SOCKET)
+		(struct sockaddr *)(void *)&address, &iAddrLen)) == INVALID_SOCKET)
 	{
 		rc = RC_SET( FERR_SVR_ACCEPT_FAIL);
 		goto Exit;
diff --git a/flaim/src/ffilehdl.cpp b/flaim/src/ffilehdl.cpp
index ac4748c..410673e 100644
--- a/flaim/src/ffilehdl.cpp
+++ b/flaim/src/ffilehdl.cpp
@@ -291,6 +291,19 @@ Exit:
 	return( rc);
 }
 
+/****************************************************************************
+Desc:
+****************************************************************************/
+RCODE F_FileHdlMgr::InsertNew(
+	F_MutexRef *		pMutexRef,
+	F_FileHdlImp *		pFileHdl)
+{
+	pMutexRef->Lock();
+	m_ListMgr.InsertAtEnd( FHM_USED_LIST, (F_ListItem *)pFileHdl);
+	pMutexRef->Unlock();
+	return( FERR_OK);
+}
+
 /****************************************************************************
 Desc:		Make the specified F_FileHdlImp available for someone else to use.
 ****************************************************************************/
diff --git a/flaim/src/ffilehdl.h b/flaim/src/ffilehdl.h
index 08f4785..03a76f5 100644
--- a/flaim/src/ffilehdl.h
+++ b/flaim/src/ffilehdl.h
@@ -217,15 +217,9 @@ private:
 		FLMBOOL				bReadOnlyFlag,	// TRUE if looking for read only file
 		F_FileHdlImp **	ppFileHdl);		// [out] returned F_FileHdlImp object.
 
-	FINLINE RCODE InsertNew(
+	RCODE InsertNew(
 		F_MutexRef *		pMutexRef,
-		F_FileHdlImp *		pFileHdl)		// FileHdl to add to this manager.
-	{
-		pMutexRef->Lock();							// ENTER CRITICAL SECTION
-		m_ListMgr.InsertAtEnd( FHM_USED_LIST, (F_ListItem *)pFileHdl);
-		pMutexRef->Unlock();							// EXIT CRITICAL SECTION
-		return( FERR_OK);
-	}
+		F_FileHdlImp *		pFileHdl);		// FileHdl to add to this manager.
 
 	RCODE MakeAvailAndRelease(			// Make the specified F_FileHdlImp available for
 												// someone else to use.
diff --git a/flaim/src/flaim.h b/flaim/src/flaim.h
index 5323342..8c6236f 100644
--- a/flaim/src/flaim.h
+++ b/flaim/src/flaim.h
@@ -5997,7 +5997,7 @@
 	} REBUILD_INFO;
 
 	/// Return an error string for a corruption code.
-	FLMEXP char * FLMAPI FlmVerifyErrToStr(
+	FLMEXP const char * FLMAPI FlmVerifyErrToStr(
 		eCorruptionType	eCorruption		///< Corruption code.
 		);
 
diff --git a/flaim/src/flchktr.cpp b/flaim/src/flchktr.cpp
index 28e157e..d3e4773 100644
--- a/flaim/src/flchktr.cpp
+++ b/flaim/src/flchktr.cpp
@@ -1641,7 +1641,7 @@ FSTATIC RCODE chkSetupLfTable(
 					rc = RC_SET( FERR_MEM);
 					goto Exit;
 				}
-				pLogicalFile->pIfd = (IFD_p)(&pLogicalFile->pIxd [1]);
+				pLogicalFile->pIfd = (IFD_p)(void *)(&pLogicalFile->pIxd [1]);
 				f_memcpy( pLogicalFile->pIxd, pTmpIxd, sizeof( IXD));
 				f_memcpy( pLogicalFile->pIfd, pTmpIfd,
 								sizeof( IFD) * pTmpIxd->uiNumFlds);
diff --git a/flaim/src/flerrstr.cpp b/flaim/src/flerrstr.cpp
index 9975f2f..dd51b02 100644
--- a/flaim/src/flerrstr.cpp
+++ b/flaim/src/flerrstr.cpp
@@ -29,7 +29,7 @@
 **					REFLECTED IN THE CHECK CODE DEFINES FOUND IN flaim.h
 */
 
-char *	FlmCorruptStrings[ FLM_LAST_CORRUPT_ERROR]
+const char * FlmCorruptStrings[ FLM_LAST_CORRUPT_ERROR]
 =	{
 	"OK",										// 0
 	"BAD_CHAR",								// 1
@@ -122,7 +122,7 @@ char *	FlmCorruptStrings[ FLM_LAST_CORRUPT_ERROR]
 Desc : Returns a pointer to the string representation of a corruption
 		 error code.
 *END************************************************************************/
-char * FlmVerifyErrToStr(
+const char * FlmVerifyErrToStr(
 	eCorruptionType	eCorruption
 	)
 {
diff --git a/flaim/util/ftxunix.cpp b/flaim/util/ftxunix.cpp
index 8d36352..e1c6cf9 100644
--- a/flaim/util/ftxunix.cpp
+++ b/flaim/util/ftxunix.cpp
@@ -28,7 +28,9 @@
 #ifdef FLM_UNIX
 
 #if defined( FLM_HPUX) || defined( FLM_OSF)
-	#define _XOPEN_CURSES
+	#ifndef _XOPEN_CURSES
+		#define _XOPEN_CURSES
+	#endif
 	#define _XOPEN_SOURCE_EXTENDED 1
 #endif