diff --git a/components/codetools/laz_xmlstreaming.pas b/components/codetools/laz_xmlstreaming.pas
index ff89df74f9..eccc56dd2a 100644
--- a/components/codetools/laz_xmlstreaming.pas
+++ b/components/codetools/laz_xmlstreaming.pas
@@ -82,9 +82,9 @@ type
     procedure WriteSet(Value: LongInt; SetType: Pointer); override;
     procedure WriteString(const Value: String); override;
     procedure WriteWideString(const Value: WideString); override;
-  {$IF DECLARED(UnicodeString)}
+    {$IFDEF FPC_HAS_UNICODESTRING}
     procedure WriteUnicodeString(const Value: UnicodeString); override;
-  {$IFEND}
+    {$ENDIF}
     {$IFDEF HasReadWriteBuf}
     procedure Write(const Buffer; Count: Longint); override;
     {$ENDIF}
@@ -131,9 +131,9 @@ type
     function ReadStr: String; override;
     function ReadString(StringType: TValueType): String; override;
     function ReadWideString: WideString; override;
-  {$IF DECLARED(UnicodeString)}
+    {$IFDEF FPC_HAS_UNICODESTRING}
     function ReadUnicodeString: UnicodeString; override;
-  {$IFEND}
+    {$ENDIF}
     procedure SkipComponent(SkipComponentInfos: Boolean); override;
     procedure SkipValue; override;
     {$IFDEF HasReadWriteBuf}
@@ -458,13 +458,13 @@ begin
   GetPropertyElement('widestring')['value'] := System.UTF8Encode(Value);
 end;
 
-{$IF DECLARED(UnicodeString)}
+{$IFDEF FPC_HAS_UNICODESTRING}
 procedure TXMLObjectWriter.WriteUnicodeString(const Value: UnicodeString);
 // save unicodestrings as utf8
 begin
   GetPropertyElement('unicodestring')['value'] := System.UTF8Encode(Value);
 end;
-{$IFEND}
+{$ENDIF}
 
 {$IFDEF HasReadWriteBuf}
 procedure TXMLObjectWriter.Write(const Buffer; Count: Longint);
@@ -673,10 +673,10 @@ begin
           Result:=vaExtended
         else if FElement.NodeName='widestring' then
           Result:=vaWString
-{$IF DECLARED(UnicodeString)}
+        {$IFDEF FPC_HAS_UNICODESTRING}
         else if FElement.NodeName='unicodestring' then
           Result:=vaUString
-{$IFEND}
+        {$ENDIF}
         else if FElement.NodeName='collectionproperty' then
           Result:=vaCollection
         else
@@ -1059,7 +1059,7 @@ begin
   //writeln('TXMLObjectReader.ReadWideString "',ValueAsUTF8,'"');
 end;
 
-{$IF DECLARED(UnicodeString)}
+{$IFDEF FPC_HAS_UNICODESTRING}
 function TXMLObjectReader.ReadUnicodeString: UnicodeString;
 var
   ValueAsUTF8: String;
@@ -1068,7 +1068,7 @@ begin
   Result:=System.UTF8Decode(ValueAsUTF8);
   ReadValue;
 end;
-{$IFEND}
+{$ENDIF}
 
 procedure TXMLObjectReader.SkipComponent(SkipComponentInfos: Boolean);
 var