diff --git a/harbour/contrib/os2pm/os2pm.c b/harbour/contrib/os2pm/os2pm.c
index 54af2d1fde..6d6c49d5a9 100644
--- a/harbour/contrib/os2pm/os2pm.c
+++ b/harbour/contrib/os2pm/os2pm.c
@@ -1,3 +1,7 @@
+/*
+ * $Id$
+ */
+
 
 #define INCL_BASE
 #define INCL_PM
diff --git a/harbour/contrib/os2pm/os2pm.ch b/harbour/contrib/os2pm/os2pm.ch
index ed79f2325e..cd7271a59e 100644
--- a/harbour/contrib/os2pm/os2pm.ch
+++ b/harbour/contrib/os2pm/os2pm.ch
@@ -1,3 +1,6 @@
+/*
+ * $Id$
+ */
 
 
 #define _OS2EMX_H
diff --git a/harbour/contrib/os2pm/tform.prg b/harbour/contrib/os2pm/tform.prg
index f542b4bb6b..1af253c729 100644
--- a/harbour/contrib/os2pm/tform.prg
+++ b/harbour/contrib/os2pm/tform.prg
@@ -26,7 +26,7 @@ METHOD New() CLASS TForm
       // so we hide again the OS API details
 
       WinRegisterClass( "HB_TFORM",;
-                        nOr( CS_SIZEREDRAW, 0x2000001 ), 0 )
+                        (CS_SIZEREDRAW + 0x2000001), 0 )
       ::lRegistered = .t.
    endif
 
@@ -35,11 +35,11 @@ METHOD New() CLASS TForm
 
    ::hWnd = WinCreateStdWindow( HWND_DESKTOP,;
                                 WS_VISIBLE,;
-                                nOr( FCF_TITLEBAR, FCF_SYSMENU,;
-                                FCF_SIZEBORDER, FCF_TASKLIST,;
-                                FCF_MINMAX, FCF_SHELLPOSITION ),;
+                                (FCF_TITLEBAR + FCF_SYSMENU +;
+                                FCF_SIZEBORDER + FCF_TASKLIST +;
+                                FCF_MINMAX + FCF_SHELLPOSITION ),;
                                 "HB_TFORM", "Harbour TForm",;
-                                nOr( WS_SYNCPAINT, WS_VISIBLE ),,,;
+                                (WS_SYNCPAINT + WS_VISIBLE ),,,;
                                 @hWndClient ) // Not used yet
 
 return Self