diff --git a/uuu/autocomplete.cpp b/uuu/autocomplete.cpp
index 36dc45ef..49a2b27b 100644
--- a/uuu/autocomplete.cpp
+++ b/uuu/autocomplete.cpp
@@ -29,6 +29,8 @@
 *
 */
 
+#include "autocomplete.h"
+
 #include <iostream>
 #include <stdio.h>
 #include <thread>
diff --git a/uuu/autocomplete.h b/uuu/autocomplete.h
new file mode 100644
index 00000000..a6a41896
--- /dev/null
+++ b/uuu/autocomplete.h
@@ -0,0 +1,35 @@
+/*
+* Copyright 2020 NXP.
+*
+* Redistribution and use in source and binary forms, with or without modification,
+* are permitted provided that the following conditions are met:
+*
+* Redistributions of source code must retain the above copyright notice, this
+* list of conditions and the following disclaimer.
+*
+* Redistributions in binary form must reproduce the above copyright notice, this
+* list of conditions and the following disclaimer in the documentation and/or
+* other materials provided with the distribution.
+*
+* Neither the name of the NXP Semiconductor nor the names of its
+* contributors may be used to endorse or promote products derived from this
+* software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+* POSSIBILITY OF SUCH DAMAGE.
+*
+*/
+
+#pragma once
+
+int auto_complete(int argc, char**argv);
+void print_autocomplete_help();
diff --git a/uuu/uuu.cpp b/uuu/uuu.cpp
index 8704c0bf..4fdec723 100644
--- a/uuu/uuu.cpp
+++ b/uuu/uuu.cpp
@@ -29,6 +29,7 @@
 *
 */
 
+#include "autocomplete.h"
 #include "print_helpers.h"
 #include <iostream>
 #include <stdio.h>
@@ -69,8 +70,6 @@ void clean_vt_color() noexcept
 using namespace std;
 
 int get_console_width();
-int auto_complete(int argc, char**argv);
-void print_autocomplete_help();
 
 static vector<string> g_usb_path_filter;