diff --git a/fsw/src/sample_app.c b/fsw/src/sample_app.c
index 5a4b027..660c698 100644
--- a/fsw/src/sample_app.c
+++ b/fsw/src/sample_app.c
@@ -31,6 +31,7 @@
 #include "sample_app_events.h"
 #include "sample_app_version.h"
 #include "sample_app.h"
+#include "sample_table.h"
 
 #include <string.h>
 
diff --git a/fsw/src/sample_app_msg.h b/fsw/src/sample_app_msg.h
index b333a57..59efcd9 100644
--- a/fsw/src/sample_app_msg.h
+++ b/fsw/src/sample_app_msg.h
@@ -72,16 +72,6 @@ typedef struct
 
 } OS_PACK sample_hk_tlm_t;
 
-/*
-** Table structure
-*/
-typedef struct
-{
-    uint16     Int1;
-    uint16     Int2;
-
-} SampleTable_t;
-
 #endif /* _sample_app_msg_h_ */
 
 /************************/
diff --git a/fsw/src/sample_table.c b/fsw/src/sample_table.c
index 7715ee0..8a682c5 100644
--- a/fsw/src/sample_table.c
+++ b/fsw/src/sample_table.c
@@ -21,17 +21,7 @@
 */
 
 #include "cfe_tbl_filedef.h"  /* Required to obtain the CFE_TBL_FILEDEF macro definition */
-
-/*
-** The following is an example of a data structure the application may have declared
-** as the format of their table.
-*/
-typedef struct
-{
-    uint16     Int1;
-    uint16     Int2;
-
-} SampleTable_t;
+#include "sample_table.h"
 
 /*
 ** The following is an example of the declaration statement that defines the desired
diff --git a/fsw/src/sample_table.h b/fsw/src/sample_table.h
new file mode 100644
index 0000000..b416dc4
--- /dev/null
+++ b/fsw/src/sample_table.h
@@ -0,0 +1,47 @@
+/*******************************************************************************
+**
+**      GSC-18128-1, "Core Flight Executive Version 6.6"
+**
+**      Copyright (c) 2006-2019 United States Government as represented by
+**      the Administrator of the National Aeronautics and Space Administration.
+**      All Rights Reserved.
+**
+**      Licensed under the Apache License, Version 2.0 (the "License");
+**      you may not use this file except in compliance with the License.
+**      You may obtain a copy of the License at
+**
+**        http://www.apache.org/licenses/LICENSE-2.0
+**
+**      Unless required by applicable law or agreed to in writing, software
+**      distributed under the License is distributed on an "AS IS" BASIS,
+**      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+**      See the License for the specific language governing permissions and
+**      limitations under the License.
+**
+** File: sample_table.h
+**
+** Purpose:
+**  Define sample table
+**
+** Notes:
+**
+**
+*******************************************************************************/
+#ifndef _sample_table_h_
+#define _sample_table_h_
+
+/*
+** Table structure
+*/
+typedef struct
+{
+    uint16     Int1;
+    uint16     Int2;
+
+} SampleTable_t;
+
+#endif /* _sample_table_h_ */
+
+/************************/
+/*  End of File Comment */
+/************************/