5 files changed, 6 insertions, 29 deletions
diff --git a/src/lib/misc/hotp/hotp.cpp b/src/lib/misc/hotp/hotp.cpp
index b9791bc9b..e9d0cc91e 100644
--- a/src/lib/misc/hotp/hotp.cpp
+++ b/src/lib/misc/hotp/hotp.cpp
@@ -6,7 +6,7 @@
 */
 
 #include <botan/otp.h>
-#include <botan/loadstor.h>
+#include <botan/internal/loadstor.h>
 #include <botan/exceptn.h>
 
 namespace Botan {
diff --git a/src/lib/misc/hotp/hotp.h b/src/lib/misc/hotp/hotp.h
deleted file mode 100644
index d8c545557..000000000
--- a/src/lib/misc/hotp/hotp.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-* HOTP
-* (C) 2017 Jack Lloyd
-*
-* Botan is released under the Simplified BSD License (see license.txt)
-*/
-
-#ifndef BOTAN_HOTP_H_
-#define BOTAN_HOTP_H_
-
-#include <botan/otp.h>
-BOTAN_DEPRECATED_HEADER(hotp.h)
-
-#endif
diff --git a/src/lib/misc/hotp/info.txt b/src/lib/misc/hotp/info.txt
index 880940c59..39c92713f 100644
--- a/src/lib/misc/hotp/info.txt
+++ b/src/lib/misc/hotp/info.txt
@@ -7,3 +7,7 @@ TOTP -> 20180816
 hmac
 utils
 </requires>
+
+<header:public>
+otp.h
+</header:public>
diff --git a/src/lib/misc/hotp/totp.cpp b/src/lib/misc/hotp/totp.cpp
index 5e1c23f61..c80b37d9e 100644
--- a/src/lib/misc/hotp/totp.cpp
+++ b/src/lib/misc/hotp/totp.cpp
@@ -6,7 +6,7 @@
 */
 
 #include <botan/otp.h>
-#include <botan/calendar.h>
+#include <botan/internal/calendar.h>
 
 namespace Botan {
 
diff --git a/src/lib/misc/hotp/totp.h b/src/lib/misc/hotp/totp.h
deleted file mode 100644
index a5a083192..000000000
--- a/src/lib/misc/hotp/totp.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* (C) 2017 Jack Lloyd
-*
-* Botan is released under the Simplified BSD License (see license.txt)
-*/
-
-#ifndef BOTAN_TOTP_H_
-#define BOTAN_TOTP_H_
-
-#include <botan/otp.h>
-BOTAN_DEPRECATED_HEADER(totp.h)
-
-#endif