diff --git a/libvncauth/d3des.c b/d3des.c
similarity index 100%
rename from libvncauth/d3des.c
rename to d3des.c
diff --git a/libvncauth/d3des.h b/d3des.h
similarity index 100%
rename from libvncauth/d3des.h
rename to d3des.h
diff --git a/d3des.o b/d3des.o
new file mode 100644
index 0000000..5202cef
Binary files /dev/null and b/d3des.o differ
diff --git a/libvncauth/Imakefile b/libvncauth/Imakefile
deleted file mode 100644
index 2e100a6..0000000
--- a/libvncauth/Imakefile
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#ifdef SunArchitecture
-CC = gcc
-CCOPTIONS =
-CDEBUGFLAGS = -O2
-#endif
-
-SRCS = vncauth.c d3des.c
-
-OBJS = vncauth.o d3des.o
-
-INCLUDES = -I. -I../include
-
-NormalLibraryTarget(vncauth,$(OBJS))
-
-DependTarget()
diff --git a/libvncauth/Makefile b/libvncauth/Makefile
deleted file mode 100644
index 2781222..0000000
--- a/libvncauth/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-OBJS=vncauth.o d3des.o
-
-CFLAGS=-I.
-
-all: libvncauth.a
-
-libvncauth.a: $(OBJS)
-	$(AR) clq $@ $(OBJS)
-
diff --git a/libvncauth/vncauth.h b/libvncauth/vncauth.h
deleted file mode 100644
index 86dc455..0000000
--- a/libvncauth/vncauth.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *  Copyright (C) 1999 AT&T Laboratories Cambridge.  All Rights Reserved.
- *
- *  This is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This software is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this software; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
- *  USA.
- */
-
-/* 
- * vncauth.h - describes the functions provided by the vncauth library.
- */
-
-#define MAXPWLEN 8
-#define CHALLENGESIZE 16
-
-extern int vncEncryptAndStorePasswd(char *passwd, char *fname);
-extern char *vncDecryptPasswdFromFile(char *fname);
-extern void vncRandomBytes(unsigned char *bytes);
-extern void vncEncryptBytes(unsigned char *bytes, char *passwd);
diff --git a/libvncauth/vncauth.c b/vncauth.c
similarity index 98%
rename from libvncauth/vncauth.c
rename to vncauth.c
index b5d4283..69f38cf 100644
--- a/libvncauth/vncauth.c
+++ b/vncauth.c
@@ -26,8 +26,8 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <vncauth.h>
-#include <d3des.h>
+#include "rfb.h"
+#include "d3des.h"
 
 
 /*