diff --git a/.cdtproject b/.cdtproject
deleted file mode 100644
index 784922d7..00000000
--- a/.cdtproject
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse-cdt version="2.0"?>
-
-<cdtproject id="org.eclipse.cdt.make.core.make">
-<extension point="org.eclipse.cdt.core.BinaryParser" id="org.eclipse.cdt.core.ELF"/>
-<extension point="org.eclipse.cdt.core.CIndexer" id="org.eclipse.cdt.core.domsourceindexer"/>
-<data>
-<item id="org.eclipse.cdt.core.pathentry">
-<pathentry kind="src" path=""/>
-<pathentry kind="out" path=""/>
-<pathentry kind="con" path="org.eclipse.cdt.make.core.DISCOVERED_SCANNER_INFO"/>
-</item>
-<item id="cdt_indexer">
-<indexEnabled indexValue="true"/>
-<indexerProblemsEnabled indexProblemsValue="0"/>
-</item>
-<item id="scannerConfiguration">
-<autodiscovery enabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile" problemReportingEnabled="true"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction useDefault="true" command="gcc" arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-</item>
-</data>
-</cdtproject>
diff --git a/.project b/.project
deleted file mode 100644
index 64b240cd..00000000
--- a/.project
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>sics</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.cdt.make.core.makeBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>org.eclipse.cdt.core.errorOutputParser</key>
-					<value>org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.VCErrorParser;</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.fullBuildTarget</key>
-					<value>clean all</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.incrementalBuildTarget</key>
-					<value>all</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
-					<value>false</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.buildLocation</key>
-					<value></value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableFullBuild</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enabledIncrementalBuild</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
-					<value>clean</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
-					<value>false</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.buildArguments</key>
-					<value>-f makefile_slinux</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.buildCommand</key>
-					<value>make</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.autoBuildTarget</key>
-					<value>all</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.stopOnError</key>
-					<value>false</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.make.core.ScannerConfigBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.ScannerConfigDiscoveryEnabled</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.makeBuilderParserId</key>
-					<value>org.eclipse.cdt.make.core.GCCScannerInfoConsoleParser</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.esiProviderCommandEnabled</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.siProblemGenerationEnabled</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.useDefaultESIProviderCmd</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.makeBuilderParserEnabled</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.esiProviderParserId</key>
-					<value>org.eclipse.cdt.make.core.GCCSpecsConsoleParser</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.make.core.makeNature</nature>
-		<nature>org.eclipse.cdt.make.core.ScannerConfigNature</nature>
-	</natures>
-</projectDescription>
diff --git a/mcstas/dmc/MKMonitor.comp b/mcstas/dmc/MKMonitor.comp
index 8927f61c..79eb2803 100644
--- a/mcstas/dmc/MKMonitor.comp
+++ b/mcstas/dmc/MKMonitor.comp
@@ -10,7 +10,7 @@
 * %I
 * Written by: Kim Lefmann
 * Date: October 4, 1997
-* Version: $Revision$
+* Version: $Revision: 1.19 $
 * Origin: Risoe
 * Release: McStas 1.6
 * Modified to write monitor file for SICS: Mark Koennecke, June 2005
diff --git a/mcstas/dmc/PSD_monitor.comp b/mcstas/dmc/PSD_monitor.comp
index 0103aaa8..8ae68401 100644
--- a/mcstas/dmc/PSD_monitor.comp
+++ b/mcstas/dmc/PSD_monitor.comp
@@ -10,7 +10,7 @@
 * %I
 * Written by: Kim Lefmann
 * Date: Feb 3, 1998
-* Version: $Revision$
+* Version: $Revision: 1.2 $
 * Origin: Risoe
 * Release: McStas 1.6
 *
diff --git a/napi.c b/napi.c
index 3920f900..8271a3ef 100644
--- a/napi.c
+++ b/napi.c
@@ -23,7 +23,7 @@
 
 ----------------------------------------------------------------------------*/
 
-static const char* rscid = "$Id$";	/* Revision interted by CVS */
+static const char* rscid = "$Id: napi.c,v 1.13 2006/03/03 15:30:55 koennecke Exp $";	/* Revision interted by CVS */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/napi.h b/napi.h
index 2d38809c..f27b05b7 100644
--- a/napi.h
+++ b/napi.h
@@ -21,7 +21,7 @@
  
   For further information, see <http://www.neutron.anl.gov/NeXus/>
   
-  $Id$
+  $Id: napi.h,v 1.10 2006/03/03 15:30:55 koennecke Exp $
 
  ----------------------------------------------------------------------------*/
   
diff --git a/napi4.c b/napi4.c
index 8277a836..1dd21969 100644
--- a/napi4.c
+++ b/napi4.c
@@ -21,7 +21,7 @@
              
   For further information, see <http://www.neutron.anl.gov/NeXus/>
   
-  $Id$
+  $Id: napi4.c,v 1.8 2006/03/31 15:24:53 koennecke Exp $
 
 ----------------------------------------------------------------------------*/
 #include <stdlib.h>
diff --git a/napiu.c b/napiu.c
index ec3c5ce0..635b0cd9 100644
--- a/napiu.c
+++ b/napiu.c
@@ -21,10 +21,10 @@
  
   For further information, see <http://www.nexus.anl.gov/>
   
-  $Id$
+  $Id: napiu.c,v 1.1 2005/10/05 07:20:18 koennecke Exp $
 
  ----------------------------------------------------------------------------*/
-static const char* rscid = "$Id$";	/* Revision interted by CVS */
+static const char* rscid = "$Id: napiu.c,v 1.1 2005/10/05 07:20:18 koennecke Exp $";	/* Revision interted by CVS */
 
 #include <stdlib.h>
 #include <assert.h>
diff --git a/napiu.h b/napiu.h
index 3c93a83c..d57915b3 100644
--- a/napiu.h
+++ b/napiu.h
@@ -21,7 +21,7 @@
  
   For further information, see <http://www.nexus.anl.gov/>
   
-  $Id$
+  $Id: napiu.h,v 1.1 2005/10/05 07:20:18 koennecke Exp $
 
  ----------------------------------------------------------------------------*/
   
diff --git a/object.tcl b/object.tcl
index 7aa7e856..e0e73b14 100755
--- a/object.tcl
+++ b/object.tcl
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $Id: object.tcl,v 1.1 2000/02/25 16:21:41 cvs Exp $
 #
 # This software is copyright (C) 1995 by the Lawrence Berkeley Laboratory.
 #