--- a/connectivity/com.nokia.carbide.remoteConnections.discovery.pccs/src/com/nokia/carbide/remoteconnections/discovery/pccs/pccsnative/DMHANDLE.java	Mon Mar 22 15:53:16 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/*
-* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-package com.nokia.carbide.remoteconnections.discovery.pccs.pccsnative;
-
-import com.sun.jna.FromNativeContext;
-import com.sun.jna.Pointer;
-import com.sun.jna.PointerType;
-
-public class DMHANDLE extends PointerType {
-	// Constant value representing an invalid HANDLE.
-    public static DMHANDLE INVALID_HANDLE_VALUE = new DMHANDLE(Pointer.createConstant(-1));
-	
-	private boolean immutable;
-    public DMHANDLE() { }
-    public DMHANDLE(Pointer p) { setPointer(p); immutable = true; }
-    /** Override to the appropriate object for INVALID_HANDLE_VALUE. */
-    public Object fromNative(Object nativeValue, FromNativeContext context) {
-        Object o = super.fromNative(nativeValue, context);
-        if (INVALID_HANDLE_VALUE.equals(o))
-            return INVALID_HANDLE_VALUE;
-        return o;
-    }
-    public void setPointer(Pointer p) {
-        if (immutable)
-            throw new UnsupportedOperationException("immutable reference"); //$NON-NLS-1$
-        super.setPointer(p);
-    }
-}

--- a/connectivity/com.nokia.carbide.remoteConnections.discovery.pccs/src/com/nokia/carbide/remoteconnections/discovery/pccs/pccsnative/LPDMHANDLE.java	Mon Mar 22 15:53:16 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
-* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-package com.nokia.carbide.remoteconnections.discovery.pccs.pccsnative;
-
-import com.sun.jna.Pointer;
-import com.sun.jna.ptr.ByReference;
-
-public class LPDMHANDLE extends ByReference {
-	public LPDMHANDLE() {
-		this(null);
-	}
-    public LPDMHANDLE(DMHANDLE h) {
-        super(Pointer.SIZE);
-        setValue(h);
-    }
-    public void setValue(DMHANDLE h) {
-        getPointer().setPointer(0, h != null ? h.getPointer() : null);
-    }
-    public DMHANDLE getValue() {
-        Pointer p = getPointer().getPointer(0);
-        if (p == null)
-            return null;
-        if (DMHANDLE.INVALID_HANDLE_VALUE.getPointer().equals(p)) 
-            return DMHANDLE.INVALID_HANDLE_VALUE;
-        DMHANDLE h = new DMHANDLE();
-        h.setPointer(p);
-        return h;
-    }
-}