diff --git a/dlls/msacm/msacm_main.c b/dlls/msacm/msacm_main.c
index ab493f5d893..dc4fb6094ce 100644
--- a/dlls/msacm/msacm_main.c
+++ b/dlls/msacm/msacm_main.c
@@ -15,7 +15,7 @@
 DEFAULT_DEBUG_CHANNEL(msacm);
 
 /**************************************************************************
- * 			MSACM_LibMain			[EntryPoint]
+ *		DllEntryPoint (MSACM.255)
  *
  * MSACM DLL entry point
  *
diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c
index e07837779fe..54607a1cf29 100644
--- a/dlls/msvcrt/data.c
+++ b/dlls/msvcrt/data.c
@@ -39,17 +39,40 @@ int MSVCRT_app_type;
 
 typedef void (__cdecl *MSVCRT__INITTERMFUN)(void);
 
-char * __cdecl MSVCRT__strdup(const char *);
+/***********************************************************************
+ *		__p___argc (MSVCRT.@)
+ */
+unsigned int *__cdecl MSVCRT___p___argc(void) { return &MSVCRT___argc; }
 
-/* Data access functions */
-#define GET_UINT_PTR(x) unsigned int __cdecl *MSVCRT___p_##x(void) { return &MSVCRT_##x; }
-GET_UINT_PTR(__argc)
-GET_UINT_PTR(_commode)
-GET_UINT_PTR(_fmode)
-GET_UINT_PTR(_osver)
-GET_UINT_PTR(_winmajor)
-GET_UINT_PTR(_winminor)
-GET_UINT_PTR(_winver)
+/***********************************************************************
+ *		__p__commode (MSVCRT.@)
+ */
+unsigned int *__cdecl MSVCRT___p__commode(void) { return &MSVCRT__commode; }
+
+/***********************************************************************
+ *		__p__fmode (MSVCRT.@)
+ */
+unsigned int *__cdecl MSVCRT___p__fmode(void) { return &MSVCRT__fmode; }
+
+/***********************************************************************
+ *		__p__osver (MSVCRT.@)
+ */
+unsigned int *__cdecl MSVCRT___p__osver(void) { return &MSVCRT__osver; }
+
+/***********************************************************************
+ *		__p__winmajor (MSVCRT.@)
+ */
+unsigned int *__cdecl MSVCRT___p__winmajor(void) { return &MSVCRT__winmajor; }
+
+/***********************************************************************
+ *		__p__winminor (MSVCRT.@)
+ */
+unsigned int *__cdecl MSVCRT___p__winminor(void) { return &MSVCRT__winminor; }
+
+/***********************************************************************
+ *		__p__winver (MSVCRT.@)
+ */
+unsigned int *__cdecl MSVCRT___p__winver(void) { return &MSVCRT__winver; }
 
 /*********************************************************************
  *		__p__acmdln (MSVCRT.@)
diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c
index 43a29107eca..8e0910010a6 100644
--- a/dlls/msvcrt/math.c
+++ b/dlls/msvcrt/math.c
@@ -706,24 +706,254 @@ ldiv_t __cdecl MSVCRT_ldiv(long num, long denom)
 }
 #endif /* ifdef __i386__ */
 
-/* I _think_ these functions are intended to work around the pentium fdiv bug */
-#define DUMMY_FUNC(x) void __cdecl MSVCRT_##x(void) { TRACE("stub"); }
-DUMMY_FUNC(_adj_fdiv_m16i)
-DUMMY_FUNC(_adj_fdiv_m32)
-DUMMY_FUNC(_adj_fdiv_m32i)
-DUMMY_FUNC(_adj_fdiv_m64)
-DUMMY_FUNC(_adj_fdiv_r)
-DUMMY_FUNC(_adj_fdivr_m16i)
-DUMMY_FUNC(_adj_fdivr_m32)
-DUMMY_FUNC(_adj_fdivr_m32i)
-DUMMY_FUNC(_adj_fdivr_m64)
-DUMMY_FUNC(_adj_fpatan)
-DUMMY_FUNC(_adj_fprem)
-DUMMY_FUNC(_adj_fprem1)
-DUMMY_FUNC(_adj_fptan)
-DUMMY_FUNC(_adjust_fdiv)
-DUMMY_FUNC(_safe_fdiv);
-DUMMY_FUNC(_safe_fdivr);
-DUMMY_FUNC(_safe_fprem);
-DUMMY_FUNC(_safe_fprem1);
+/***********************************************************************
+ *		_adj_fdiv_m16i (MSVCRT.@)
+ * FIXME
+ *    This function is likely to have the wrong number of arguments.
+ *
+ * NOTE
+ *    I _think_ this function is intended to work around the Pentium
+ *    fdiv bug.
+ */
+void __cdecl MSVCRT__adj_fdiv_m16i(void)
+{
+  TRACE("(): stub");
+}
+
+/***********************************************************************
+ *		_adj_fdiv_m32 (MSVCRT.@)
+ * FIXME
+ *    This function is likely to have the wrong number of arguments.
+ *
+ * NOTE
+ *    I _think_ this function is intended to work around the Pentium
+ *    fdiv bug.
+ */
+void __cdecl MSVCRT__adj_fdiv_m32(void)
+{
+  TRACE("(): stub");
+}
+
+/***********************************************************************
+ *		_adj_fdiv_m32i (MSVCRT.@)
+ * FIXME
+ *    This function is likely to have the wrong number of arguments.
+ *
+ * NOTE
+ *    I _think_ this function is intended to work around the Pentium
+ *    fdiv bug.
+ */
+void __cdecl MSVCRT__adj_fdiv_m32i(void)
+{
+  TRACE("(): stub");
+}
+
+/***********************************************************************
+ *		_adj_fdiv_m64 (MSVCRT.@)
+ * FIXME
+ *    This function is likely to have the wrong number of arguments.
+ *
+ * NOTE
+ *    I _think_ this function is intended to work around the Pentium
+ *    fdiv bug.
+ */
+void __cdecl MSVCRT__adj_fdiv_m64(void)
+{
+  TRACE("(): stub");
+}
+
+/***********************************************************************
+ *		_adj_fdiv_r (MSVCRT.@)
+ * FIXME
+ *    This function is likely to have the wrong number of arguments.
+ *
+ * NOTE
+ *    I _think_ this function is intended to work around the Pentium
+ *    fdiv bug.
+ */
+void __cdecl MSVCRT__adj_fdiv_r(void)
+{
+  TRACE("(): stub");
+}
+
+/***********************************************************************
+ *		_adj_fdivr_m16i (MSVCRT.@)
+ * FIXME
+ *    This function is likely to have the wrong number of arguments.
+ *
+ * NOTE
+ *    I _think_ this function is intended to work around the Pentium
+ *    fdiv bug.
+ */
+void __cdecl MSVCRT__adj_fdivr_m16i(void)
+{
+  TRACE("(): stub");
+}
+
+/***********************************************************************
+ *		_adj_fdivr_m32 (MSVCRT.@)
+ * FIXME
+ *    This function is likely to have the wrong number of arguments.
+ *
+ * NOTE
+ *    I _think_ this function is intended to work around the Pentium
+ *    fdiv bug.
+ */
+void __cdecl MSVCRT__adj_fdivr_m32(void)
+{
+  TRACE("(): stub");
+}
+
+/***********************************************************************
+ *		_adj_fdivr_m32i (MSVCRT.@)
+ * FIXME
+ *    This function is likely to have the wrong number of arguments.
+ *
+ * NOTE
+ *    I _think_ this function is intended to work around the Pentium
+ *    fdiv bug.
+ */
+void __cdecl MSVCRT__adj_fdivr_m32i(void)
+{
+  TRACE("(): stub");
+}
+
+/***********************************************************************
+ *		_adj_fdivr_m64 (MSVCRT.@)
+ * FIXME
+ *    This function is likely to have the wrong number of arguments.
+ *
+ * NOTE
+ *    I _think_ this function is intended to work around the Pentium
+ *    fdiv bug.
+ */
+void __cdecl MSVCRT__adj_fdivr_m64(void)
+{
+  TRACE("(): stub");
+}
+
+/***********************************************************************
+ *		_adj_fpatan (MSVCRT.@)
+ * FIXME
+ *    This function is likely to have the wrong number of arguments.
+ *
+ * NOTE
+ *    I _think_ this function is intended to work around the Pentium
+ *    fdiv bug.
+ */
+void __cdecl MSVCRT__adj_fpatan(void)
+{
+  TRACE("(): stub");
+}
+
+/***********************************************************************
+ *		_adj_fprem (MSVCRT.@)
+ * FIXME
+ *    This function is likely to have the wrong number of arguments.
+ *
+ * NOTE
+ *    I _think_ this function is intended to work around the Pentium
+ *    fdiv bug.
+ */
+void __cdecl MSVCRT__adj_fprem(void)
+{
+  TRACE("(): stub");
+}
+
+/***********************************************************************
+ *		_adj_fprem1 (MSVCRT.@)
+ * FIXME
+ *    This function is likely to have the wrong number of arguments.
+ *
+ * NOTE
+ *    I _think_ this function is intended to work around the Pentium
+ *    fdiv bug.
+ */
+void __cdecl MSVCRT__adj_fprem1(void)
+{
+  TRACE("(): stub");
+}
+
+/***********************************************************************
+ *		_adj_fptan (MSVCRT.@)
+ * FIXME
+ *    This function is likely to have the wrong number of arguments.
+ *
+ * NOTE
+ *    I _think_ this function is intended to work around the Pentium
+ *    fdiv bug.
+ */
+void __cdecl MSVCRT__adj_fptan(void)
+{
+  TRACE("(): stub");
+}
+
+/***********************************************************************
+ *		_adjust_fdiv (MSVCRT.@)
+ * FIXME
+ *    I _think_ this function should be a variable indicating whether
+ *    Pentium fdiv bug safe code should be used.
+ */
+void __cdecl MSVCRT__adjust_fdiv(void)
+{
+  TRACE("(): stub");
+}
+
+/***********************************************************************
+ *		_safe_fdiv (MSVCRT.@)
+ * FIXME
+ *    This function is likely to have the wrong number of arguments.
+ *
+ * NOTE
+ *    I _think_ this function is intended to work around the Pentium
+ *    fdiv bug.
+ */
+void __cdecl MSVCRT__safe_fdiv(void)
+{
+  TRACE("(): stub");
+}
+
+/***********************************************************************
+ *		_safe_fdivr (MSVCRT.@)
+ * FIXME
+ *    This function is likely to have the wrong number of arguments.
+ *
+ * NOTE
+ *    I _think_ this function is intended to work around the Pentium
+ *    fdiv bug.
+ */
+void __cdecl MSVCRT__safe_fdivr(void)
+{
+  TRACE("(): stub");
+}
+
+/***********************************************************************
+ *		_safe_fprem (MSVCRT.@)
+ * FIXME
+ *    This function is likely to have the wrong number of arguments.
+ *
+ * NOTE
+ *    I _think_ this function is intended to work around the Pentium
+ *    fdiv bug.
+ */
+void __cdecl MSVCRT__safe_fprem(void)
+{
+  TRACE("(): stub");
+}
+
+/***********************************************************************
+ *		_safe_fprem1 (MSVCRT.@)
+ *
+ * FIXME
+ *    This function is likely to have the wrong number of arguments.
+ *
+ * NOTE
+ *    I _think_ this function is intended to work around the Pentium
+ *    fdiv bug.
+ */
+void __cdecl MSVCRT__safe_fprem1(void)
+{
+  TRACE("(): stub");
+}
+