diff --git a/include/applicat.h b/include/applicat.h
index c0a740a2d..926eb9346 100755
--- a/include/applicat.h
+++ b/include/applicat.h
@@ -45,7 +45,7 @@ class TApplication
 
 protected:
   const char* get_module_name() const;
-  static long task_eh(WINDOW win, EVENT* ep);
+  static long XVT_CALLCONV1 task_eh(WINDOW win, EVENT* ep);
 
   virtual long handler(WINDOW win, EVENT* ep);
   virtual bool extended_firm() const { return FALSE; } // Extended set_firm dialog box
@@ -113,4 +113,4 @@ public:
 bool xvt_running();        // xvt is running?
 TApplication& main_app();
 
-#endif // __APPLICATION_H
+#endif /* __APPLICATION_H */
diff --git a/include/controls.cpp b/include/controls.cpp
index 1bbc646b8..2fdb4d5f1 100755
--- a/include/controls.cpp
+++ b/include/controls.cpp
@@ -286,7 +286,7 @@ TControl::~TControl()
 {}
 
 
-long TControl::handler(WINDOW win, EVENT* ep)
+long XVT_CALLCONV1 TControl::handler(WINDOW win, EVENT* ep)
 {
   static bool tracking = FALSE;
   static bool pressed = FALSE;
diff --git a/include/controls.h b/include/controls.h
index c3eaaf711..58cc479aa 100755
--- a/include/controls.h
+++ b/include/controls.h
@@ -68,7 +68,7 @@ WINDOW xvt_create_checkbox(
   bool _multiple : 1;
 
 protected:
-  static long handler(WINDOW win, EVENT* ep);
+  static long XVT_CALLCONV1 handler(WINDOW win, EVENT* ep);
 
   void create(short left, short top, short right, short bottom,
               const char* caption,
diff --git a/include/mailbox.cpp b/include/mailbox.cpp
index 3ae6f1287..678d268d7 100755
--- a/include/mailbox.cpp
+++ b/include/mailbox.cpp
@@ -1,4 +1,4 @@
-//      $Id: mailbox.cpp,v 1.11 1995-01-16 15:10:23 guy Exp $
+//      $Id: mailbox.cpp,v 1.12 1995-03-16 13:43:55 alex Exp $
 
 #include <stdlib.h>
 #include <fstream.h>
@@ -25,7 +25,7 @@ TMessage::TMessage(const char* to, const char* sub,
   _to = rec;  
   _subject = sub;
   _text = text;
-  _from = (from == NULL || *from == '\0') ? main_app().name() : from;
+  _from = (from == NULL || *from == '\0') ? main_app().name() : TString(from);
   _flags = 0x00; _number = -1;
 }
 
diff --git a/include/printer.cpp b/include/printer.cpp
index 7473c6453..a0321d2a1 100755
--- a/include/printer.cpp
+++ b/include/printer.cpp
@@ -58,7 +58,7 @@ void TPrinter::_get_windows_printer_names (TToken_string & t)
   delete buf;
 }
 
-BOOLEAN TPrinter::start_winprint (long data)
+BOOLEAN XVT_CALLCONV1 TPrinter::start_winprint (long data)
 {
   PrDesc *pd = (PrDesc *) data;
   TTextfile& txt = *(pd->_txt);
diff --git a/include/printer.h b/include/printer.h
index c8698b5ed..4e12b79ba 100755
--- a/include/printer.h
+++ b/include/printer.h
@@ -188,7 +188,7 @@ public:
   virtual ~TPrinter();    
   
 #if XVT_OS == XVT_OS_WIN        
-  static BOOLEAN start_winprint(long);
+  static BOOLEAN XVT_CALLCONV1 start_winprint(long);
   
 #endif
   void set_config_file (const char * ffile) { _config = ffile ; }
diff --git a/include/value.h b/include/value.h
index 269dc093b..83d1d86dd 100755
--- a/include/value.h
+++ b/include/value.h
@@ -1,4 +1,4 @@
-//      $Id: value.h,v 1.2 1994-12-29 14:51:40 villa Exp $   
+//      $Id: value.h,v 1.3 1995-03-16 13:44:07 alex Exp $   
 // language types for Simulation and SimulationManager  
 // -------------------------------------------------------------------------
 
@@ -13,7 +13,10 @@
 #ifndef _iostream_h
 #include <iostream.h>
 #endif
+#ifdef __WATCOMC__
+#include stdlib.h
 
+#endif
 
 enum basetype
 {
diff --git a/include/window.cpp b/include/window.cpp
index 4669a44a4..588591043 100755
--- a/include/window.cpp
+++ b/include/window.cpp
@@ -181,7 +181,7 @@ TWindow::TWindow()
 {}
 
 
-long TWindow::window_handler(WINDOW win, EVENT* ep)
+long XVT_CALLCONV1 TWindow::window_handler(WINDOW win, EVENT* ep)
 {
   TWindow* w = (TWindow*)get_app_data(win);
   CHECK(w != NULL, "Invalid window");
diff --git a/include/window.h b/include/window.h
index bcfc421a0..aab4946f8 100755
--- a/include/window.h
+++ b/include/window.h
@@ -65,7 +65,7 @@ protected:
   bool _pixmap  : 1;            // Se se le coordiante sono in pixel
 
   // @FPROT
-  static long window_handler(WINDOW win, EVENT* ep);
+  static long XVT_CALLCONV1 window_handler(WINDOW win, EVENT* ep);
   virtual WINDOW create(short x, short y, short dx, short dy,
                         const char* title = "", long flags = WSF_NONE,
                         WIN_TYPE rt = W_DOC, WINDOW parent = NULL_WIN, int menu = 0) ;
diff --git a/include/xvtility.cpp b/include/xvtility.cpp
index 086318def..879fd227b 100755
--- a/include/xvtility.cpp
+++ b/include/xvtility.cpp
@@ -59,9 +59,12 @@ HIDDEN COLOR RGB2COLOR(COLORREF c)
   return MAKE_COLOR(red, gre, blu);
 }
 
+#ifndef XVT_CALLCONV1
+#define XVT_CALLCONV1
+#endif
 
 extern "C" {
-  WINDOW xvtwi_hwnd_to_window(HWND);
+  WINDOW XVT_CALLCONV1 xvtwi_hwnd_to_window(HWND);
 #include <statbar.h>
 }
 #include <controls.h>