Index: trunk/src/VBox/Runtime/common/fuzz/fuzz.cpp
===================================================================
--- trunk/src/VBox/Runtime/common/fuzz/fuzz.cpp	(revision 83426)
+++ trunk/src/VBox/Runtime/common/fuzz/fuzz.cpp	(revision 85121)
@@ -51,4 +51,7 @@
 
 
+/*********************************************************************************************************************************
+*   Defined Constants And Macros                                                                                                 *
+*********************************************************************************************************************************/
 #define RTFUZZCTX_MAGIC UINT32_C(0xdeadc0de) /** @todo */
 
@@ -96,6 +99,6 @@
  * @param   ppMutation          Where to store the created mutation on success.
  */
-typedef DECLCALLBACK(int) FNRTFUZZCTXMUTATORPREP(PRTFUZZCTXINT pThis, uint64_t offStart, PRTFUZZMUTATION pMutationParent,
-                                                 PPRTFUZZMUTATION ppMutation);
+typedef DECLCALLBACKTYPE(int, FNRTFUZZCTXMUTATORPREP,(PRTFUZZCTXINT pThis, uint64_t offStart, PRTFUZZMUTATION pMutationParent,
+                                                      PPRTFUZZMUTATION ppMutation));
 /** Pointer to a mutator preparation callback. */
 typedef FNRTFUZZCTXMUTATORPREP *PFNRTFUZZCTXMUTATORPREP;
@@ -112,6 +115,6 @@
  * @param   cbBuf               Size of the remaining buffer.
  */
-typedef DECLCALLBACK(int) FNRTFUZZCTXMUTATOREXEC(PRTFUZZCTXINT pThis, PCRTFUZZMUTATION pMutation, const void *pvMutation,
-                                                 uint8_t *pbBuf, size_t cbBuf);
+typedef DECLCALLBACKTYPE(int, FNRTFUZZCTXMUTATOREXEC,(PRTFUZZCTXINT pThis, PCRTFUZZMUTATION pMutation, const void *pvMutation,
+                                                      uint8_t *pbBuf, size_t cbBuf));
 /** Pointer to a mutator execution callback. */
 typedef FNRTFUZZCTXMUTATOREXEC *PFNRTFUZZCTXMUTATOREXEC;
@@ -128,6 +131,6 @@
  * @param   pvUser              Opaque user data to pass to the export callback.
  */
-typedef DECLCALLBACK(int) FNRTFUZZCTXMUTATOREXPORT(PRTFUZZCTXINT pThis, PCRTFUZZMUTATION pMutation, const void *pvMutation,
-                                                   PFNRTFUZZCTXEXPORT pfnExport, void *pvUser);
+typedef DECLCALLBACKTYPE(int, FNRTFUZZCTXMUTATOREXPORT,(PRTFUZZCTXINT pThis, PCRTFUZZMUTATION pMutation, const void *pvMutation,
+                                                        PFNRTFUZZCTXEXPORT pfnExport, void *pvUser));
 /** Pointer to a mutator export callback. */
 typedef FNRTFUZZCTXMUTATOREXPORT *PFNRTFUZZCTXMUTATOREXPORT;
@@ -144,6 +147,6 @@
  * @param   pvUser              Opaque user data to pass to the import callback.
  */
-typedef DECLCALLBACK(int) FNRTFUZZCTXMUTATORIMPORT(PRTFUZZCTXINT pThis, PCRTFUZZMUTATION pMutation, void *pvMutation,
-                                                   PFNRTFUZZCTXIMPORT pfnImport, void *pvUser);
+typedef DECLCALLBACKTYPE(int, FNRTFUZZCTXMUTATORIMPORT,(PRTFUZZCTXINT pThis, PCRTFUZZMUTATION pMutation, void *pvMutation,
+                                                        PFNRTFUZZCTXIMPORT pfnImport, void *pvUser));
 /** Pointer to a mutator import callback. */
 typedef FNRTFUZZCTXMUTATORIMPORT *PFNRTFUZZCTXMUTATORIMPORT;
Index: trunk/src/VBox/Runtime/common/fuzz/fuzzclientcmd.cpp
===================================================================
--- trunk/src/VBox/Runtime/common/fuzz/fuzzclientcmd.cpp	(revision 83426)
+++ trunk/src/VBox/Runtime/common/fuzz/fuzzclientcmd.cpp	(revision 85121)
@@ -46,6 +46,8 @@
 
 
-
-typedef DECLCALLBACK(int) FNLLVMFUZZERTESTONEINPUT(const uint8_t *pbData, size_t cbData);
+/*********************************************************************************************************************************
+*   Structures and Typedefs                                                                                                      *
+*********************************************************************************************************************************/
+typedef DECLCALLBACKTYPE(int, FNLLVMFUZZERTESTONEINPUT,(const uint8_t *pbData, size_t cbData));
 typedef FNLLVMFUZZERTESTONEINPUT *PFNLLVMFUZZERTESTONEINPUT;
 
