diff --git a/compiler/aoptda.pas b/compiler/aoptda.pas
index 28020598f1..60b1b6bdca 100644
--- a/compiler/aoptda.pas
+++ b/compiler/aoptda.pas
@@ -70,7 +70,7 @@ Unit aoptda;
         TmpReg: TRegister;
     }
     Begin
-    {!!!!!!!!!!
+    (*!!!!!!!!!!
       p := BlockStart;
       UsedRegs.Create;
       UsedRegs.Update(p);
@@ -159,7 +159,7 @@ Unit aoptda;
     {      Inc(InstrCnt);}
           GetNextInstruction(p, p);
         End;
-    }
+    *)
     End;
 
 End.
diff --git a/compiler/aoptobj.pas b/compiler/aoptobj.pas
index 8e67843a92..b0e3971f6c 100644
--- a/compiler/aoptobj.pas
+++ b/compiler/aoptobj.pas
@@ -384,8 +384,8 @@ Unit AoptObj;
           Counter: Byte;
           TmpResult: Boolean;
       }
-      Begin
-      {!!!!!!!!!!1
+      begin
+      (*!!!!!!!!!!1
         RegsChecked := [];
         content := regs[which];
         p := content.StartMod;
@@ -423,7 +423,7 @@ Unit AoptObj;
             GetNextInstruction(p,p)
           End;
         RegInSequence := TmpResult
-      }
+      *)
       End;
 
 
@@ -458,14 +458,14 @@ Unit AoptObj;
 
       Function ArrayRefsEq(const r1, r2: TReference): Boolean;
       Begin
-      {!!!!!!!!!!
+      (*!!!!!!!!!!
         ArrayRefsEq := (R1.Offset+R1.OffsetFixup = R2.Offset+R2.OffsetFixup) And
       {$ifdef refsHaveSegmentReg}
                        (R1.Segment = R2.Segment) And
       {$endif}
                        (R1.Base = R2.Base) And
                        (R1.Symbol=R2.Symbol);
-      }
+      *)
       End;
 
       Procedure TPaiProp.DestroyRefs(Const Ref: TReference; WhichReg: TRegister;
@@ -478,7 +478,7 @@ Unit AoptObj;
           Counter: TRegister;
       }
       Begin
-      {!!!!!!!!!!!
+      (*!!!!!!!!!!!
         WhichReg := RegMaxSize(WhichReg);
         If (Ref.base = procinfo.FramePointer) or
             Assigned(Ref.Symbol) Then
@@ -549,13 +549,13 @@ Unit AoptObj;
                        )
                    )
                 Then DestroyReg(Counter, InstrSinceLastMod)
-      }
+      *)
       End;
 
       Procedure TPaiProp.DestroyAllRegs(var InstrSinceLastMod: TInstrSinceLastMod);
       {Var Counter: TRegister;}
       Begin {initializes/desrtoys all registers}
-      {!!!!!!!!!
+      (*!!!!!!!!!
         For Counter := LoGPReg To HiGPReg Do
           Begin
             ReadReg(Counter);
@@ -563,7 +563,7 @@ Unit AoptObj;
           End;
         CondRegs.Init;
       { FPURegs.Init; }
-      }
+      *)
       End;
 
       Procedure TPaiProp.DestroyOp(const o:Toper; var InstrSinceLastMod:
@@ -593,14 +593,14 @@ Unit AoptObj;
 
       Procedure TPaiProp.ReadRef(Ref: PReference);
       Begin
-      {!!!!!!!
+      (*!!!!!!
         If Ref^.Base <> R_NO Then
           ReadReg(Ref^.Base);
       {$ifdef refsHaveIndexReg}
         If Ref^.Index <> R_NO Then
           ReadReg(Ref^.Index);
       {$endif}
-      }
+      *)
       End;
 
       Procedure TPaiProp.ReadOp(const o:toper);
@@ -616,7 +616,7 @@ Unit AoptObj;
       Procedure TPaiProp.ModifyReg(reg: TRegister; Var InstrSinceLastMod:
                                      TInstrSinceLastMod);
       Begin
-      {!!!!!!!
+      (*!!!!!!!
         With Regs[reg] Do
           If (Typ = Con_Ref)
             Then
@@ -631,7 +631,7 @@ Unit AoptObj;
               End
             Else
               DestroyReg(Reg, InstrSinceLastMod);
-      }
+      *)
       End;
 
       Procedure TPaiProp.ModifyOp(const oper: TOper; var InstrSinceLastMod:
diff --git a/compiler/arm/aasmcpu.pas b/compiler/arm/aasmcpu.pas
index 0c4cb5f133..4b0d10878f 100644
--- a/compiler/arm/aasmcpu.pas
+++ b/compiler/arm/aasmcpu.pas
@@ -1560,7 +1560,7 @@ implementation
 
 
 {$ifdef dummy}
-      (*
+(*
 static void gencode (long segment, long offset, int bits,
                      insn *ins, char *codes, long insn_end)
 {
@@ -1581,7 +1581,7 @@ static void gencode (long segment, long offset, int bits,
     0x05, 0x07, 0x06,
   };
 
-(*
+
 #ifdef DEBUG
 static char *CC[] =
   {                                    /* condition code names */
@@ -1591,7 +1591,7 @@ static char *CC[] =
     "PL", "VC", "VS", "",
     "S"
 };
-*)
+
 
     has_S_code = (ins->condition & C_SSETFLAG);
     has_B_code = (ins->condition & C_BSETFLAG);
@@ -1600,7 +1600,7 @@ static char *CC[] =
     has_F_code = (ins->condition & C_FSETFLAG);
     ins->condition = (ins->condition & 0x0F);
 
-(*
+
     if (rt_debug)
       {
     printf ("gencode: instruction: %s%s", insn_names[ins->opcode],
@@ -1628,7 +1628,7 @@ static char *CC[] =
     bytes[2] = 0xE;
     bytes[3] = 0xF;
       }
-*)
+
     // First condition code in upper nibble
     if (ins->condition < C_NONE)
       {
@@ -2493,10 +2493,8 @@ static char *CC[] =
     out (offset, segment, bytes, OUT_RAWDATA+4, NO_SEG, NO_SEG);
 }
 
-
 *)
-{$endif dummy
-}
+{$endif dummy}
 
 begin
   cai_align:=tai_align;
diff --git a/compiler/arm/cgcpu.pas b/compiler/arm/cgcpu.pas
index e0b75ea4e6..4cd4266547 100644
--- a/compiler/arm/cgcpu.pas
+++ b/compiler/arm/cgcpu.pas
@@ -1287,7 +1287,7 @@ unit cgcpu;
             if current_procinfo.framepointer<>NR_STACK_POINTER_REG then
               list.concat(taicpu.op_reg_reg_const(A_SUB,NR_FRAME_POINTER_REG,NR_R12,4));
 
-            { allocate necessary stack size
+           (* allocate necessary stack size
               not necessary according to Yury Sidorov
 
             { don't use a_op_const_reg_reg here because we don't allow register allocations
@@ -1349,7 +1349,7 @@ unit cgcpu;
                  end
              end
             else
-            }
+            *)
             if LocalSize<>0 then
               if not(is_shifter_const(localsize,shift)) then
                 begin
diff --git a/compiler/i386/ra386int.pas b/compiler/i386/ra386int.pas
index bf7858df61..366595bac1 100644
--- a/compiler/i386/ra386int.pas
+++ b/compiler/i386/ra386int.pas
@@ -39,7 +39,7 @@ Unit ra386int;
     uses
       rabase,systems,rax86,aasmcpu;
 
-{
+(*
     procedure ti386intreader.handleopcode;
       var
         instr : Tx86Instruction;
@@ -55,7 +55,7 @@ Unit ra386int;
         instr.ConcatInstruction(curlist);
         instr.Free;
       end;
-}
+*)
 
 {*****************************************************************************
                                Initialize