diff --git a/reactos/lib/crt/stdio/vfscanf.c b/reactos/lib/crt/stdio/vfscanf.c
index d9ceb2f8ba5..d4e7de6cb5d 100644
--- a/reactos/lib/crt/stdio/vfscanf.c
+++ b/reactos/lib/crt/stdio/vfscanf.c
@@ -32,7 +32,6 @@
 #include <msvcrt/mbstring.h>
 #include <msvcrt/internal/stdio.h>
 
-#define CHECKPOINT1 do{ char a[30]; sprintf(a,"%i\n",__LINE__); OutputDebugStringA(a); } while(0)
 
 #ifdef __USE_W32API
 int __set_errno(int err);
@@ -81,7 +80,6 @@ unsigned long int __strtoul_internal  (const char *__nptr,  char **__endptr, int
    } while (0)
 # define conv_error() do {            \
      funlockfile (s);          \
-     CHECKPOINT1; \
      return done;           \
    } while (0)
 # define input_error() do {            \
@@ -899,18 +897,14 @@ number:
             if (flags & (LONG|LONGDBL))
             {
                double d = __strtod_internal (wp, &tw, flags & GROUP);
-               CHECKPOINT1;
                if (!(flags & SUPPRESS) && tw != wp){
-                  CHECKPOINT1;
                   *ARG (double *) = negative ? -d : d;
                }
             }
             else
             {
                float d = __strtof_internal (wp, &tw, flags & GROUP);
-               CHECKPOINT1;
                if (!(flags & SUPPRESS) && tw != wp){
-                  CHECKPOINT1;
                   *ARG (float *) = negative ? -d : d;
                }
             }
diff --git a/reactos/lib/crtdll/makefile b/reactos/lib/crtdll/makefile
index ef83d41b95b..1145c2aba1a 100644
--- a/reactos/lib/crtdll/makefile
+++ b/reactos/lib/crtdll/makefile
@@ -15,7 +15,7 @@ TARGET_BASE = $(TARGET_BASE_LIB_CRTDLL)
 # don't remove @nn from exported symbols - needed so dlltool doesn't mess up mangled c++ exports
 RM_AT_FROM_SYMBOLS = no
 
-TARGET_LFLAGS = -nostartfiles -nostdlib --enable-stdcall-fixup
+TARGET_LFLAGS = -nostartfiles -nostdlib
 
 TARGET_SDKLIBS = crt.a string.a kernel32.a ntdll.a wine.a
 
@@ -33,21 +33,10 @@ TARGET_CFLAGS += \
 	-DUSE_MSVCRT_PREFIX \
 	-D_MT
 
-TARGET_OBJECTS = $(TARGET_NAME).o
-
-TARGET_CLEAN = dllmain.o
+TARGET_OBJECTS = dllmain.o
 
 include $(PATH_TO_TOP)/rules.mak
 
 include $(TOOLS_PATH)/helper.mk
 
-
-
-
-OBJECTS = 	dllmain.o
-
-$(TARGET_NAME).o: $(OBJECTS)
-	$(LD) -r $(OBJECTS) -o $(TARGET_NAME).o
-
-
 # EOF
diff --git a/reactos/lib/msvcrt/Makefile b/reactos/lib/msvcrt/Makefile
index d30005860cb..86fed1639d3 100644
--- a/reactos/lib/msvcrt/Makefile
+++ b/reactos/lib/msvcrt/Makefile
@@ -15,7 +15,7 @@ TARGET_BASE = $(TARGET_BASE_LIB_MSVCRT)
 # don't remove @nn from exported symbols - needed so dlltool doesn't mess up mangled c++ exports
 RM_AT_FROM_SYMBOLS = no
 
-TARGET_LFLAGS = -nostartfiles -nostdlib --enable-stdcall-fixup
+TARGET_LFLAGS = -nostartfiles -nostdlib
 
 TARGET_SDKLIBS = crt.a string.a kernel32.a ntdll.a wine.a
 
@@ -33,21 +33,10 @@ TARGET_CFLAGS += \
 	-DUSE_MSVCRT_PREFIX \
 	-D_MT
 
-TARGET_OBJECTS = $(TARGET_NAME).o
-
-TARGET_CLEAN = dllmain.o
+TARGET_OBJECTS = dllmain.o
 
 include $(PATH_TO_TOP)/rules.mak
 
 include $(TOOLS_PATH)/helper.mk
 
-
-
-
-OBJECTS = 	dllmain.o
-
-$(TARGET_NAME).o: $(OBJECTS)
-	$(LD) -r $(OBJECTS) -o $(TARGET_NAME).o
-
-
 # EOF
diff --git a/reactos/lib/msvcrt/msvcrt.def b/reactos/lib/msvcrt/msvcrt.def
index d94d1fb1e90..cc17d63d370 100644
--- a/reactos/lib/msvcrt/msvcrt.def
+++ b/reactos/lib/msvcrt/msvcrt.def
@@ -481,7 +481,7 @@ _scalb
 ;_scprintf
 ;_scwprintf
 _searchenv
-_seh_longjmp_unwind@4
+_seh_longjmp_unwind=_seh_longjmp_unwind@4
 ;_set_error_mode
 ;_set_SSE2_enable
 ;_set_sbh_threshold