diff --git a/cmakelists.txt b/CMakeLists.txt
similarity index 100%
rename from cmakelists.txt
rename to CMakeLists.txt
diff --git a/client/cmakelists.txt b/client/CMakeLists.txt
similarity index 100%
rename from client/cmakelists.txt
rename to client/CMakeLists.txt
diff --git a/dbug/cmakelists.txt b/dbug/CMakeLists.txt
similarity index 100%
rename from dbug/cmakelists.txt
rename to dbug/CMakeLists.txt
diff --git a/extra/cmakelists.txt b/extra/CMakeLists.txt
similarity index 100%
rename from extra/cmakelists.txt
rename to extra/CMakeLists.txt
diff --git a/extra/yassl/cmakelists.txt b/extra/yassl/CMakeLists.txt
similarity index 100%
rename from extra/yassl/cmakelists.txt
rename to extra/yassl/CMakeLists.txt
diff --git a/extra/yassl/taocrypt/cmakelists.txt b/extra/yassl/taocrypt/CMakeLists.txt
similarity index 100%
rename from extra/yassl/taocrypt/cmakelists.txt
rename to extra/yassl/taocrypt/CMakeLists.txt
diff --git a/libmysql/cmakelists.txt b/libmysql/CMakeLists.txt
similarity index 100%
rename from libmysql/cmakelists.txt
rename to libmysql/CMakeLists.txt
diff --git a/libmysqld/cmakelists.txt b/libmysqld/CMakeLists.txt
similarity index 100%
rename from libmysqld/cmakelists.txt
rename to libmysqld/CMakeLists.txt
diff --git a/libmysqld/examples/cmakelists.txt b/libmysqld/examples/CMakeLists.txt
similarity index 100%
rename from libmysqld/examples/cmakelists.txt
rename to libmysqld/examples/CMakeLists.txt
diff --git a/mysys/cmakelists.txt b/mysys/CMakeLists.txt
similarity index 100%
rename from mysys/cmakelists.txt
rename to mysys/CMakeLists.txt
diff --git a/regex/cmakelists.txt b/regex/CMakeLists.txt
similarity index 100%
rename from regex/cmakelists.txt
rename to regex/CMakeLists.txt
diff --git a/server-tools/instance-manager/cmakelists.txt b/server-tools/instance-manager/CMakeLists.txt
similarity index 100%
rename from server-tools/instance-manager/cmakelists.txt
rename to server-tools/instance-manager/CMakeLists.txt
diff --git a/sql/cmakelists.txt b/sql/CMakeLists.txt
similarity index 100%
rename from sql/cmakelists.txt
rename to sql/CMakeLists.txt
diff --git a/sql/handlerton-win.cc b/sql/handlerton-win.cc
deleted file mode 100644
index 9ce4eab2444..00000000000
--- a/sql/handlerton-win.cc
+++ /dev/null
@@ -1,72 +0,0 @@
-#include "mysql_priv.h"
-
-extern handlerton heap_hton;
-extern handlerton myisam_hton;
-extern handlerton myisammrg_hton;
-extern handlerton binlog_hton;
-#ifdef WITH_INNOBASE_STORAGE_ENGINE
-extern handlerton innobase_hton;
-#endif
-#ifdef WITH_BERKELEY_STORAGE_ENGINE
-extern handlerton berkeley_hton;
-#endif
-#ifdef WITH_EXAMPLE_STORAGE_ENGINE
-extern handlerton example_hton;
-#endif
-#ifdef WITH_ARCHIVE_STORAGE_ENGINE
-extern handlerton archive_hton;
-#endif
-#ifdef WITH_CSV_STORAGE_ENGINE
-extern handlerton tina_hton;
-#endif
-#ifdef WITH_BLACKHOLE_STORAGE_ENGINE
-extern handlerton blackhole_hton;
-#endif
-#ifdef WITH_FEDERATED_STORAGE_ENGINE
-extern handlerton federated_hton;
-#endif
-#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
-extern handlerton ndbcluster_hton;
-#endif
-#ifdef WITH_PARTITION_STORAGE_ENGINE
-extern handlerton partition_hton;
-#endif
-
-/*
-  This array is used for processing compiled in engines.
-*/
-handlerton *sys_table_types[]=
-{
-  &heap_hton,
-  &myisam_hton,
-#ifdef WITH_INNOBASE_STORAGE_ENGINE
-  &innobase_hton,
-#endif
-#ifdef WITH_BERKELEY_STORAGE_ENGINE
-  &berkeley_hton,
-#endif
-#ifdef WITH_EXAMPLE_STORAGE_ENGINE
-  &example_hton,
-#endif
-#ifdef WITH_ARCHIVE_STORAGE_ENGINE
-  &archive_hton,
-#endif
-#ifdef WITH_CSV_STORAGE_ENGINE
-  &tina_hton,
-#endif
-#ifdef WITH_BLACKHOLE_STORAGE_ENGINE
-  &blackhole_hton,
-#endif
-#ifdef WITH_FEDERATED_STORAGE_ENGINE
-  &federated_hton,
-#endif
-#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
-  &ndbcluster_hton,
-#endif
-#ifdef WITH_PARTITION_STORAGE_ENGINE
-  &partition_hton,
-#endif
-  &myisammrg_hton,
-  &binlog_hton,
-  NULL
-};
diff --git a/storage/archive/cmakelists.txt b/storage/archive/CMakeLists.txt
similarity index 100%
rename from storage/archive/cmakelists.txt
rename to storage/archive/CMakeLists.txt
diff --git a/storage/bdb/cmakelists.txt b/storage/bdb/CMakeLists.txt
similarity index 100%
rename from storage/bdb/cmakelists.txt
rename to storage/bdb/CMakeLists.txt
diff --git a/storage/blackhole/cmakelists.txt b/storage/blackhole/CMakeLists.txt
similarity index 100%
rename from storage/blackhole/cmakelists.txt
rename to storage/blackhole/CMakeLists.txt
diff --git a/storage/csv/cmakelists.txt b/storage/csv/CMakeLists.txt
similarity index 100%
rename from storage/csv/cmakelists.txt
rename to storage/csv/CMakeLists.txt
diff --git a/storage/example/cmakelists.txt b/storage/example/CMakeLists.txt
similarity index 100%
rename from storage/example/cmakelists.txt
rename to storage/example/CMakeLists.txt
diff --git a/storage/heap/cmakelists.txt b/storage/heap/CMakeLists.txt
similarity index 100%
rename from storage/heap/cmakelists.txt
rename to storage/heap/CMakeLists.txt
diff --git a/storage/innobase/cmakelists.txt b/storage/innobase/CMakeLists.txt
similarity index 100%
rename from storage/innobase/cmakelists.txt
rename to storage/innobase/CMakeLists.txt
diff --git a/storage/myisam/cmakelists.txt b/storage/myisam/CMakeLists.txt
similarity index 100%
rename from storage/myisam/cmakelists.txt
rename to storage/myisam/CMakeLists.txt
diff --git a/storage/myisammrg/cmakelists.txt b/storage/myisammrg/CMakeLists.txt
similarity index 100%
rename from storage/myisammrg/cmakelists.txt
rename to storage/myisammrg/CMakeLists.txt
diff --git a/strings/cmakelists.txt b/strings/CMakeLists.txt
similarity index 100%
rename from strings/cmakelists.txt
rename to strings/CMakeLists.txt
diff --git a/tests/cmakelists.txt b/tests/CMakeLists.txt
similarity index 100%
rename from tests/cmakelists.txt
rename to tests/CMakeLists.txt
diff --git a/vio/cmakelists.txt b/vio/CMakeLists.txt
similarity index 100%
rename from vio/cmakelists.txt
rename to vio/CMakeLists.txt
diff --git a/zlib/cmakelists.txt b/zlib/CMakeLists.txt
similarity index 100%
rename from zlib/cmakelists.txt
rename to zlib/CMakeLists.txt