--- a/hedgewars/pas2cSystem.pas	Fri Jan 06 01:51:04 2012 +0100
+++ b/hedgewars/pas2cSystem.pas	Sat Jan 07 00:10:47 2012 +0400
@@ -37,5 +37,5 @@
     StrLen, ord, Succ, Pred : function : integer;
     Low, High : function : integer;
     Now : function : integer;
-    SysUtils.StrPas, FormatDateTime : function : shortstring;
+    StrPas, FormatDateTime : function : shortstring;
     exit : procedure;

--- a/hedgewars/uLandTemplates.pas	Fri Jan 06 01:51:04 2012 +0100
+++ b/hedgewars/uLandTemplates.pas	Sat Jan 07 00:10:47 2012 +0400
@@ -22,7 +22,7 @@
 interface
 uses SDLh;
 
-const NTPX = Low(TSDL_Rect.x);
+const NTPX = Low(LongInt);
 
 type PPointArray = ^TPointArray;
      TPointArray = array[0..64] of TSDL_Rect;

--- a/tools/PascalBasics.hs	Fri Jan 06 01:51:04 2012 +0100
+++ b/tools/PascalBasics.hs	Sat Jan 07 00:10:47 2012 +0400
@@ -17,7 +17,7 @@
     , commentLine    = "//"
     , nestedComments = False
     , identStart     = letter <|> oneOf "_"
-    , identLetter    = alphaNum <|> oneOf "_."
+    , identLetter    = alphaNum <|> oneOf "_"
     , reservedNames  = [
             "begin", "end", "program", "unit", "interface"
             , "implementation", "and", "or", "xor", "shl"

--- a/tools/pas2c.hs	Fri Jan 06 01:51:04 2012 +0100
+++ b/tools/pas2c.hs	Sat Jan 07 00:10:47 2012 +0400
@@ -126,6 +126,7 @@
 uses2C :: Uses -> State RenderState Doc
 uses2C uses@(Uses unitIds) = do
     mapM_ injectNamespace (Identifier "pas2cSystem" undefined : unitIds)
+    mapM_ (id2C True) unitIds
     return $ vcat . map (\i -> text $ "#include \"" ++ i ++ ".h\"") $ uses2List uses
     where
     injectNamespace (Identifier i _) = do