diff --git a/include/local.h b/include/local.h
index 3b3f6f38a42..66ee895b4d3 100644
--- a/include/local.h
+++ b/include/local.h
@@ -23,8 +23,7 @@ extern UINT16 LOCAL_Size( HANDLE16 ds, HLOCAL16 handle );
 extern UINT16 LOCAL_Flags( HANDLE16 ds, HLOCAL16 handle );
 extern UINT16 LOCAL_HeapSize( HANDLE16 ds );
 extern UINT16 LOCAL_CountFree( HANDLE16 ds );
-extern LPSTR LOCAL_Lock( HANDLE16 ds, HLOCAL16 handle );
-extern SEGPTR LOCAL_LockSegptr( HANDLE16 ds, HLOCAL16 handle );
+extern void *LOCAL_Lock( HANDLE16 ds, HLOCAL16 handle );
 extern BOOL16 LOCAL_Unlock( HANDLE16 ds, HLOCAL16 handle );
 extern WORD LOCAL_Compact( HANDLE16 ds, UINT16 minfree, UINT16 flags );
 
diff --git a/memory/local.c b/memory/local.c
index a7f92e71b93..af507d25554 100644
--- a/memory/local.c
+++ b/memory/local.c
@@ -1396,23 +1396,13 @@ static HLOCAL16 LOCAL_InternalLock( LPSTR heap, HLOCAL16 handle )
 /***********************************************************************
  *           LOCAL_Lock
  */
-LPSTR LOCAL_Lock( HANDLE16 ds, HLOCAL16 handle )
+void *LOCAL_Lock( HANDLE16 ds, HLOCAL16 handle )
 {
     char *ptr = PTR_SEG_OFF_TO_LIN( ds, 0 );
     return handle ? ptr + LOCAL_InternalLock( ptr, handle ) : NULL;
 }
 
 
-/***********************************************************************
- *           LOCAL_LockSegptr
- */
-SEGPTR LOCAL_LockSegptr( HANDLE16 ds, HLOCAL16 handle )
-{
-    char *ptr = PTR_SEG_OFF_TO_LIN( ds, 0 );
-    return PTR_SEG_OFF_TO_SEGPTR( ds, LOCAL_InternalLock( ptr, handle ) );
-}
-
-
 /***********************************************************************
  *           LOCAL_Unlock
  */
@@ -1594,7 +1584,9 @@ HLOCAL16 WINAPI LocalFree16( HLOCAL16 handle )
  */
 SEGPTR WINAPI LocalLock16( HLOCAL16 handle )
 {
-    return LOCAL_LockSegptr( CURRENT_DS, handle );
+    WORD ds = CURRENT_DS;
+    char *ptr = PTR_SEG_OFF_TO_LIN( ds, 0 );
+    return PTR_SEG_OFF_TO_SEGPTR( ds, LOCAL_InternalLock( ptr, handle ) );
 }