diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..d466d2403b633ca7bd67ce9ea651b416aa217130
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,34 @@
+# ./
+configure
+config.status
+config.log
+include
+objects
+autom4te.cache
+lib
+Makefile
+aclocal.m4
+src/ppm_define.h
+
+# output files
+*.out
+*.sub
+*.dat
+*.o
+*.mod
+*.log
+
+# src/interpolate/test/
+src/interpolate/test/ppm_test_interp_m2p
+src/interpolate/test/ppm_test_interp_p2m
+
+# src/neighlist/test/
+src/neighlist/test/ppm_test_inl2d
+src/neighlist/test/ppm_test_inl2d_2
+src/neighlist/test/ppm_test_inl3d
+src/neighlist/test/ppm_test_inl3d_2
+
+
+# temporary files
+*.swp
+*~
diff --git a/aclocal.m4 b/aclocal.m4
index da1dccbe1e815d6aa782af25044dd37ff53440ee..b2dfb7ebd221c027e823ed3e75b5ac63fe908517 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/src/ppm_define.h b/src/ppm_define.h
index 91803f6061b4f1d6931c6c5af4fb1fdbac77e30d..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/src/ppm_define.h
+++ b/src/ppm_define.h
@@ -1,2 +0,0 @@
-#define __MPI
-#define __FFTW