2 files changed, 12 insertions, 15 deletions
diff --git a/src/libstate/info.txt b/src/libstate/info.txt
index 429fe7641..9aba6b8dd 100644
--- a/src/libstate/info.txt
+++ b/src/libstate/info.txt
@@ -26,7 +26,7 @@ algo_factory
 alloc
 bigint
 block
-def_engine
+core_engine
 engine
 filters
 hash
diff --git a/src/libstate/libstate.cpp b/src/libstate/libstate.cpp
index 1522879f7..7bb31b52c 100644
--- a/src/libstate/libstate.cpp
+++ b/src/libstate/libstate.cpp
@@ -6,8 +6,11 @@
 */
 
 #include <botan/libstate.h>
+#include <botan/charset.h>
+#include <botan/engine.h>
+#include <botan/cpuid.h>
 #include <botan/internal/defalloc.h>
-#include <botan/internal/default_engine.h>
+#include <botan/internal/core_engine.h>
 #include <botan/internal/stl_util.h>
 #include <botan/internal/mlock.h>
 #include <algorithm>
@@ -20,12 +23,8 @@
   #include <botan/internal/mmap_mem.h>
 #endif
 
-#if defined(BOTAN_HAS_ENGINE_IA32_ASSEMBLER)
-  #include <botan/internal/ia32_engine.h>
-#endif
-
-#if defined(BOTAN_HAS_ENGINE_AMD64_ASSEMBLER)
-  #include <botan/internal/amd64_engine.h>
+#if defined(BOTAN_HAS_ENGINE_ASSEMBLER)
+  #include <botan/internal/asm_engine.h>
 #endif
 
 #if defined(BOTAN_HAS_ENGINE_AES_ISA)
@@ -224,6 +223,8 @@ RandomNumberGenerator& Library_State::global_rng()
 */
 void Library_State::initialize()
    {
+   CPUID::initialize();
+
    if(m_algorithm_factory)
       throw Invalid_State("Library_State has already been initialized");
 
@@ -257,15 +258,11 @@ void Library_State::initialize()
    algorithm_factory().add_engine(new SIMD_Engine);
 #endif
 
-#if defined(BOTAN_HAS_ENGINE_AMD64_ASSEMBLER)
-   algorithm_factory().add_engine(new AMD64_Assembler_Engine);
-#endif
-
-#if defined(BOTAN_HAS_ENGINE_IA32_ASSEMBLER)
-   algorithm_factory().add_engine(new IA32_Assembler_Engine);
+#if defined(BOTAN_HAS_ENGINE_ASSEMBLER)
+   algorithm_factory().add_engine(new Assembler_Engine);
 #endif
 
-   algorithm_factory().add_engine(new Default_Engine);
+   algorithm_factory().add_engine(new Core_Engine);
 
 #if defined(BOTAN_HAS_SELFTESTS)
    confirm_startup_self_tests(algorithm_factory());