--- src/Displayer.cxx.orig	2005-05-01 04:45:38.000000000 +0200
+++ src/Displayer.cxx	2010-09-26 22:34:39.000000000 +0200
@@ -51,7 +51,7 @@
 #include "LightManager.h"
 #include "MetaState.h"
 #include "SparkleManager.h"
-#include "String.h"
+#include "CAString.h"
 #include "ScoreRecordManager.h"
 #include "Score.h"
 
--- src/Makefile.am.orig	2005-05-03 21:03:59.000000000 +0200
+++ src/Makefile.am	2010-09-26 22:34:39.000000000 +0200
@@ -5,7 +5,7 @@
 else
 audio_sources = 
 endif
-crack_attack_SOURCES = ActionRecorder.cxx Attack.cxx Block.cxx BlockManager.cxx CelebrationManager.cxx Clock.cxx ComboManager.cxx ComboTabulator.cxx Communicator.cxx ComputerPlayer.cxx ComputerPlayerAI.cxx Controller.cxx CountDownManager.cxx Creep.cxx Displayer.cxx Game.cxx Garbage.cxx GarbageFlavorImage.cxx GarbageGenerator.cxx GarbageManager.cxx GarbageQueue.cxx Grid.cxx LevelLights.cxx LightManager.cxx LoseBar.cxx MessageManager.cxx MetaState.cxx Random.cxx Sine.cxx Score.cxx ScoreRecordManager.cxx Swapper.cxx SparkleManager.cxx Spring.cxx SignManager.cxx String.cxx TextureLoader.cxx WinRecord.cxx X.cxx DrawBlocks.cxx DrawGarbage.cxx DrawCandy.cxx DrawScoreRecord.cxx DrawSwapper.cxx DrawExternalCandy.cxx DrawLevelLights.cxx DrawCountDown.cxx DrawMessages.cxx DrawWinRecord.cxx obj_block.cxx obj_garbage.cxx obj_garbage_thin_middle.cxx obj_garbage_thin_cap.cxx obj_garbage_thick_corner.cxx obj_garbage_thick_edge.cxx obj_garbage_thick_middle.cxx obj_garbage_small.cxx obj_sparkle.cxx obj_sign.cxx obj_swapper.cxx obj_external_candy.cxx obj_level_lights.cxx obj_messages.cxx obj_clock.cxx obj_name.cxx obj_score_record.cxx ActionRecorder.h Attack.h Block.h BlockManager.h CelebrationManager.h Clock.h ComboManager.h ComboTabulator.h Communicator.h ComputerPlayer.h ComputerPlayerAI.h Controller.h CountDownManager.h Creep.h Displayer.h Game.h Garbage.h GarbageFlavorImage.h GarbageGenerator.h GarbageManager.h GarbageQueue.h Grid.h LevelLights.h LightManager.h LoseBar.h MessageManager.h MetaState.h Random.h Sine.h Score.h ScoreRecordManager.h Swapper.h SparkleManager.h Spring.h SignManager.h String.h TextureLoader.h WinRecord.h X.h Mode.h prefix.h prefix.c $(audio_sources)
+crack_attack_SOURCES = ActionRecorder.cxx Attack.cxx Block.cxx BlockManager.cxx CelebrationManager.cxx Clock.cxx ComboManager.cxx ComboTabulator.cxx Communicator.cxx ComputerPlayer.cxx ComputerPlayerAI.cxx Controller.cxx CountDownManager.cxx Creep.cxx Displayer.cxx Game.cxx Garbage.cxx GarbageFlavorImage.cxx GarbageGenerator.cxx GarbageManager.cxx GarbageQueue.cxx Grid.cxx LevelLights.cxx LightManager.cxx LoseBar.cxx MessageManager.cxx MetaState.cxx Random.cxx Sine.cxx Score.cxx ScoreRecordManager.cxx Swapper.cxx SparkleManager.cxx Spring.cxx SignManager.cxx CAString.cxx TextureLoader.cxx WinRecord.cxx X.cxx DrawBlocks.cxx DrawGarbage.cxx DrawCandy.cxx DrawScoreRecord.cxx DrawSwapper.cxx DrawExternalCandy.cxx DrawLevelLights.cxx DrawCountDown.cxx DrawMessages.cxx DrawWinRecord.cxx obj_block.cxx obj_garbage.cxx obj_garbage_thin_middle.cxx obj_garbage_thin_cap.cxx obj_garbage_thick_corner.cxx obj_garbage_thick_edge.cxx obj_garbage_thick_middle.cxx obj_garbage_small.cxx obj_sparkle.cxx obj_sign.cxx obj_swapper.cxx obj_external_candy.cxx obj_level_lights.cxx obj_messages.cxx obj_clock.cxx obj_name.cxx obj_score_record.cxx ActionRecorder.h Attack.h Block.h BlockManager.h CelebrationManager.h Clock.h ComboManager.h ComboTabulator.h Communicator.h ComputerPlayer.h ComputerPlayerAI.h Controller.h CountDownManager.h Creep.h Displayer.h Game.h Garbage.h GarbageFlavorImage.h GarbageGenerator.h GarbageManager.h GarbageQueue.h Grid.h LevelLights.h LightManager.h LoseBar.h MessageManager.h MetaState.h Random.h Sine.h Score.h ScoreRecordManager.h Swapper.h SparkleManager.h Spring.h SignManager.h StringClass.h TextureLoader.h WinRecord.h X.h Mode.h prefix.h prefix.c $(audio_sources)
 
 # prefix sources compiled whether we use them or not
 
--- src/String.h.orig	2004-10-11 03:09:57.000000000 +0200
+++ src/String.h	2010-09-26 22:34:39.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- * String.h
+ * CAString.h
  * Daniel Nelson - 8/24/0
  *
  * Copyright (C) 2000  Daniel Nelson
--- src/obj_name.cxx.orig	2005-04-16 10:32:27.000000000 +0200
+++ src/obj_name.cxx	2010-09-26 22:34:39.000000000 +0200
@@ -33,7 +33,7 @@
 
 #include "Game.h"
 #include "Displayer.h"
-#include "String.h"
+#include "CAString.h"
 #include "MetaState.h"
 #include "Communicator.h"
 
--- src/obj_score_record.cxx.orig	2005-04-16 10:13:38.000000000 +0200
+++ src/obj_score_record.cxx	2010-09-26 22:34:39.000000000 +0200
@@ -34,7 +34,7 @@
 #include "Game.h"
 #include "Displayer.h"
 #include "MetaState.h"
-#include "String.h"
+#include "CAString.h"
 #include "Score.h"
 
 GLuint Displayer::score_to_beat_texture;
--- src/String.cxx.orig	2010-09-26 22:46:25.000000000 +0200
+++ src/String.cxx	2010-09-26 22:46:45.000000000 +0200
@@ -37,7 +37,7 @@
 #include "TextureLoader.h"
 #include "Game.h"
 #include "Displayer.h"
-#include "String.h"
+#include "CAString.h"
 
 const char *String::letter_texture_files[DC_FONT_NUMBER][DC_LETTER_NUMBER]
  = { { GC_DATA_DIRECTORY("font0_0.tga"),