diff --git a/dlls/kernel/Makefile.in b/dlls/kernel/Makefile.in
index 1be34a6a15a..e0410cff550 100644
--- a/dlls/kernel/Makefile.in
+++ b/dlls/kernel/Makefile.in
@@ -47,6 +47,7 @@ C_SRCS = \
 	wowthunk.c
 
 C_SRCS16 = \
+	error16.c \
 	registry16.c \
 	system.c
 
diff --git a/dlls/kernel/change.c b/dlls/kernel/change.c
index f98f8848602..601b813baf8 100644
--- a/dlls/kernel/change.c
+++ b/dlls/kernel/change.c
@@ -107,3 +107,12 @@ BOOL WINAPI FindCloseChangeNotification( HANDLE handle )
 {
     return CloseHandle( handle );
 }
+
+/***********************************************************************
+*	FileCDR (KERNEL.130)
+*/
+FARPROC16 WINAPI FileCDR16(FARPROC16 x)
+{
+    FIXME("(0x%8x): stub\n", (int) x);
+    return (FARPROC16)TRUE;
+}
diff --git a/misc/error.c b/dlls/kernel/error16.c
similarity index 99%
rename from misc/error.c
rename to dlls/kernel/error16.c
index 2f473212361..768e533fe01 100644
--- a/misc/error.c
+++ b/dlls/kernel/error16.c
@@ -288,4 +288,3 @@ void WINAPI HandleParamError( CONTEXT86 *context )
 		context->SegEs = 0;
 	}
 }
-
diff --git a/dlls/kernel/kernel_main.c b/dlls/kernel/kernel_main.c
index aa7296b6375..e283d445933 100644
--- a/dlls/kernel/kernel_main.c
+++ b/dlls/kernel/kernel_main.c
@@ -226,3 +226,14 @@ BOOL WINAPI SwitchToThread(void)
     Sleep(0);
     return 1;
 }
+
+/***********************************************************************
+ *           Beep   (KERNEL32.@)
+ */
+BOOL WINAPI Beep( DWORD dwFreq, DWORD dwDur )
+{
+    static const char beep = '\a';
+    /* dwFreq and dwDur are ignored by Win95 */
+    if (isatty(2)) write( 2, &beep, 1 );
+    return TRUE;
+}
diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in
index 22c4769066f..5992d8eefab 100644
--- a/dlls/ntdll/Makefile.in
+++ b/dlls/ntdll/Makefile.in
@@ -33,8 +33,6 @@ C_SRCS = \
 	$(TOPOBJDIR)/memory/string.c \
 	$(TOPOBJDIR)/memory/virtual.c \
 	$(TOPOBJDIR)/misc/cpu.c \
-	$(TOPOBJDIR)/misc/error.c \
-	$(TOPOBJDIR)/misc/main.c \
 	$(TOPOBJDIR)/misc/options.c \
 	$(TOPOBJDIR)/misc/registry.c \
 	$(TOPOBJDIR)/misc/version.c \
diff --git a/misc/main.c b/misc/main.c
deleted file mode 100644
index 9df4478ebc4..00000000000
--- a/misc/main.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Main function.
- *
- * Copyright 1994 Alexandre Julliard
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "config.h"
-#include "wine/port.h"
-
-#include <locale.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
-#include "windef.h"
-#include "winbase.h"
-#include "wine/winbase16.h"
-#include "winternl.h"
-#include "winnls.h"
-#include "winerror.h"
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(file);
-
-
-/***********************************************************************
- *           Beep   (KERNEL32.@)
- */
-BOOL WINAPI Beep( DWORD dwFreq, DWORD dwDur )
-{
-    static char beep = '\a';
-    /* dwFreq and dwDur are ignored by Win95 */
-    if (isatty(2)) write( 2, &beep, 1 );
-    return TRUE;
-}
-
-
-/***********************************************************************
-*	FileCDR (KERNEL.130)
-*/
-FARPROC16 WINAPI FileCDR16(FARPROC16 x)
-{
-	FIXME("(0x%8x): stub\n", (int) x);
-	return (FARPROC16)TRUE;
-}