diff -up dx-4.4.4/src/uipp/startup/Main.C.gcc43 dx-4.4.4/src/uipp/startup/Main.C
--- dx-4.4.4/src/uipp/startup/Main.C.gcc43	2000-05-16 20:53:07.000000000 +0200
+++ dx-4.4.4/src/uipp/startup/Main.C	2008-01-07 19:57:58.000000000 +0100
@@ -14,7 +14,7 @@
 extern "C" void HCLXmInit();
 #endif
 
-int main(unsigned int argc,
+int main( int          argc,
 	  char**       argv)
 {
 #if defined(HAVE_HCLXMINIT)
diff -up dx-4.4.4/src/uipp/base/Application.h.gcc43 dx-4.4.4/src/uipp/base/Application.h
--- dx-4.4.4/src/uipp/base/Application.h.gcc43	2005-11-09 19:26:29.000000000 +0100
+++ dx-4.4.4/src/uipp/base/Application.h	2008-01-07 20:35:02.000000000 +0100
@@ -49,7 +49,7 @@ class Application : public UIComponent, 
     //
     // The main program needs to access protected member functions.
     //
-    friend int main(unsigned int argc,
+    friend int main( int          argc,
 		     char**       argv);
 
 
diff -up dx-4.4.4/src/uipp/tutor/Main.C.gcc43 dx-4.4.4/src/uipp/tutor/Main.C
--- dx-4.4.4/src/uipp/tutor/Main.C.gcc43	2000-05-16 20:53:15.000000000 +0200
+++ dx-4.4.4/src/uipp/tutor/Main.C	2008-01-07 19:57:39.000000000 +0100
@@ -31,7 +31,7 @@ extern "C" void HCLXmInit();
 //
 const char *AssertMsgString = "Internal error detected at \"%s\":%d.\n";
  
-int main(unsigned int argc,
+int main( int          argc,
 	  char**       argv)
 {
 #if defined(HAVE_HCLXMINIT)
diff -up dx-4.4.4/src/uipp/widgets/MultiText.h.gcc43 dx-4.4.4/src/uipp/widgets/MultiText.h
--- dx-4.4.4/src/uipp/widgets/MultiText.h.gcc43	2006-01-03 01:12:34.000000000 +0100
+++ dx-4.4.4/src/uipp/widgets/MultiText.h	2008-01-07 19:06:27.000000000 +0100
@@ -91,7 +91,7 @@ typedef struct _XmMultiTextClassRec* XmM
 #define XmNsmoothScroll		"smoothScroll"
 #define XmNwaitCursorCount	"waitCursorCount"
 
-#if !(defined(_Xm_h) || defined(XM_H))
+#if !(defined(_Xm_h) || defined(XM_H) || defined(_XM_XM_H))
 #define XmNmarginHeight		"marginHeight"
 #define XmNmarginWidth		"marginWidth"
 #define XmNwordWrap		"wordWrap"
@@ -109,7 +109,7 @@ typedef struct _XmMultiTextClassRec* XmM
 #define XmCSmoothScroll		"SmoothScroll"
 #define XmCWaitCursorCount	"WaitCursorCount"
 
-#if !(defined(_Xm_h) || defined(XM_H))
+#if !(defined(_Xm_h) || defined(XM_H) || defined(_XM_XM_H))
 #define XmCMarginHeight		"MarginHeight"
 #define XmCMarginWidth		"MarginWidth"
 #define XmCWordWrap		"WordWrap"
diff -up dx-4.4.4/src/uipp/dxui/Main.C.gcc43 dx-4.4.4/src/uipp/dxui/Main.C
--- dx-4.4.4/src/uipp/dxui/Main.C.gcc43	2005-12-07 18:50:53.000000000 +0100
+++ dx-4.4.4/src/uipp/dxui/Main.C	2008-01-07 19:57:21.000000000 +0100
@@ -48,7 +48,7 @@ extern unsigned long _etext;
 //
 const char *AssertMsgString = "Internal error detected at \"%s\":%d.\n";
  
-int main(unsigned int argc,
+int main( int          argc,
 	  char**       argv)
 {
 #if defined(HAVE_HCLXMINIT)
diff -up dx-4.4.4/src/uipp/prompter/Main.C.gcc43 dx-4.4.4/src/uipp/prompter/Main.C
--- dx-4.4.4/src/uipp/prompter/Main.C.gcc43	2000-05-16 20:52:59.000000000 +0200
+++ dx-4.4.4/src/uipp/prompter/Main.C	2008-01-07 19:57:01.000000000 +0100
@@ -17,7 +17,7 @@ extern "C" void HCLXmInit();
 #endif
 
 
-int main(unsigned int argc,
+int main( int          argc,
 	  char**       argv)
 {
 #if defined(HAVE_HCLXMINIT)
diff -up dx-4.4.4/src/uipp/mb/Main.C.gcc43 dx-4.4.4/src/uipp/mb/Main.C
--- dx-4.4.4/src/uipp/mb/Main.C.gcc43	2000-05-20 19:49:40.000000000 +0200
+++ dx-4.4.4/src/uipp/mb/Main.C	2008-01-07 19:56:41.000000000 +0100
@@ -22,7 +22,7 @@ extern "C" void HCLXmInit();
 //
 const char *AssertMsgString = "Internal error detected at \"%s\":%d.\n";
 
-int main(unsigned int argc,
+int main( int          argc,
 	  char**       argv)
 {
 #if defined(HAVE_HCLXMINIT)