diff --git a/include/nn/acp.h b/include/nn/acp.h
index 29d0e81f..920aea93 100644
--- a/include/nn/acp.h
+++ b/include/nn/acp.h
@@ -5,8 +5,7 @@
  *
  */
 
-#include <nn/acp/client_c.h>
-#include <nn/acp/client_cpp.h>
+#include <nn/acp/client.h>
 #include <nn/acp/device.h>
 #include <nn/acp/result.h>
 #include <nn/acp/save.h>
diff --git a/include/nn/acp/client_c.h b/include/nn/acp/client.h
similarity index 100%
rename from include/nn/acp/client_c.h
rename to include/nn/acp/client.h
diff --git a/include/nn/acp/client_cpp.h b/include/nn/acp/client_cpp.h
deleted file mode 100644
index 9dc4accc..00000000
--- a/include/nn/acp/client_cpp.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include <wut.h>
-#include <nn/result.h>
-
-#ifdef __cplusplus
-
-namespace nn {
-
-namespace acp {
-
-nn::Result
-Initialize(void)
-   asm("Initialize__Q2_2nn3acpFv");
-
-nn::Result
-Finalize(void)
-   asm("Finalize__Q2_2nn3acpFv");
-
-} //namespace acp
-
-} //namespace nn
-
-#endif //__cplusplus
diff --git a/tests/test_compile_headers_common/test_compile_headers_list.h b/tests/test_compile_headers_common/test_compile_headers_list.h
index 9d575e4e..f8ac7ae4 100644
--- a/tests/test_compile_headers_common/test_compile_headers_list.h
+++ b/tests/test_compile_headers_common/test_compile_headers_list.h
@@ -83,8 +83,7 @@
 #include <mic/mic.h>
 #include <nn/ac/ac_c.h>
 #include <nn/ac/ac_cpp.h>
-#include <nn/acp/client_c.h>
-#include <nn/acp/client_cpp.h>
+#include <nn/acp/client.h>
 #include <nn/acp/drcled_c.h>
 #include <nn/acp/drcled_cpp.h>
 #include <nn/acp/device.h>